use Kotlin call hierarchy provider only for Kotlin elements, to ensure that it does not interfere with standard Java features of IntelliJ IDEA

(cherry picked from commit 7004917)

.idea/artifacts/KotlinAndroidExtensions.xml

@@ -1,7 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <component name="ArtifactManager">
   <artifact name="KotlinAndroidExtensions">
     <output-path>$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions</output-path>
+    <properties id="ant-postprocessing">
+      <options enabled="true">
+        <file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
+        <target>copy-runtime-for-idea-plugin</target>
+      </options>
+    </properties>
     <root id="root">
       <element id="directory" name="lib">
         <element id="archive" name="kotlin-android-extensions.jar">
@@ -15,7 +20,6 @@
         <element id="archive" name="android-compiler-plugin.jar">
           <element id="module-output" name="android-compiler-plugin" />
         </element>
-        <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
       </element>
     </root>
   </artifact>

.idea/artifacts/KotlinJpsPlugin.xml

@@ -21,6 +21,8 @@
       <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
       <element id="module-output" name="kotlinr" />
       <element id="module-output" name="rmi-interface" />
+      <element id="module-output" name="deserialization" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/native-platform-uberjar.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>

.idea/artifacts/KotlinPlugin.xml

@@ -45,7 +45,7 @@
           <element id="module-output" name="idea-js" />
           <element id="module-output" name="container" />
           <element id="module-output" name="rmi-interface" />
-          <element id="module-output" name="kotlinr" />
+          <element id="module-output" name="idea-repl" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">

.idea/codeStyleSettings.xml

@@ -274,7 +274,7 @@
             <option name="TAB_SIZE" value="8" />
           </indentOptions>
         </codeStyleSettings>
-        <codeStyleSettings language="jet">
+        <codeStyleSettings language="kotlin">
           <option name="ELSE_ON_NEW_LINE" value="true" />
           <option name="WHILE_ON_NEW_LINE" value="true" />
           <option name="CATCH_ON_NEW_LINE" value="true" />

.idea/compiler.xml

@@ -5,6 +5,7 @@
     <option name="BUILD_PROCESS_HEAP_SIZE" value="2000" />
     <excludeFromCompile>
       <directory url="file://$PROJECT_DIR$/core/reflection.jvm" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/core/runtime.jvm" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
@@ -26,4 +27,4 @@
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
   </component>
-</project>
+</project>

.idea/dictionaries/Nikolay_Krasko.xml

@@ -17,6 +17,7 @@
       <w>redeclarations</w>
       <w>subclassed</w>
       <w>subgraph</w>
+      <w>substep</w>
     </words>
   </dictionary>
 </component>

.idea/dictionaries/valentin.xml

@@ -9,6 +9,7 @@
       <w>inserter</w>
       <w>negatable</w>
       <w>pparent</w>
+      <w>precheck</w>
       <w>prioritizer</w>
       <w>processings</w>
       <w>rbrace</w>
@@ -17,6 +18,7 @@
       <w>rparenth</w>
       <w>selectioner</w>
       <w>unpluralize</w>
+      <w>weighers</w>
     </words>
   </dictionary>
 </component>

.idea/inspectionProfiles/idea_default.xml

@@ -408,7 +408,6 @@
     <inspection_tool class="UnnecessaryUnboxing" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UseOfPropertiesAsHashtable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="VolatileLongOrDoubleField" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WaitNotInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WaitWhileHoldingTwoLocks" enabled="true" level="WARNING" enabled_by_default="true" />

.idea/kotlinc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinCommonCompilerArguments">
-    <option name="suppressWarnings" value="true" />
-  </component>
-</project>
-

.idea/libraries/junit_plugin.xml

@@ -5,6 +5,7 @@
     </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/junit/lib/idea-junit.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/junit/lib/resources_en.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

.idea/libraries/native_platform_uberjar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="native-platform-uberjar">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/native-platform-uberjar.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/testng_plugin.xml

@@ -6,6 +6,8 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/testng/lib/testng-plugin.jar!/" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/testng/lib/testng.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/testng/lib/jcommander.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/testng/lib/resources_en.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

.idea/libraries/trove4j.xml

@@ -8,10 +8,10 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/trove4j_src.jar!/core/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/trove4j_src.jar!/test/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/trove4j_src.jar!/util/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/trove4j_src.jar!/generated/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/src/trove4j_src.jar!/core/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/src/trove4j_src.jar!/generated/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/src/trove4j_src.jar!/test/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/src/trove4j_src.jar!/util/src" />
     </SOURCES>
   </library>
 </component>

.idea/modules.xml

@@ -19,6 +19,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" filepath="$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/container/container.iml" filepath="$PROJECT_DIR$/compiler/container/container.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
@@ -36,6 +37,7 @@
       <module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-js/idea-js.iml" filepath="$PROJECT_DIR$/idea/idea-js/idea-js.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" />
       <module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />

.idea/runConfigurations/Generate_Tests.xml

@@ -6,7 +6,7 @@
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.tests.TestsPackage" />
+    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.tests.GenerateTestsKt" />
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />

.idea/runConfigurations/IDEA.xml

@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA" type="Application" factoryName="Application">
+  <configuration default="false" name="IDEA" type="Application" factoryName="Application" singleton="true">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="ENABLE_SWING_INSPECTOR" value="false" />
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />

.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application">
+  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />

Kotlin.iml

@@ -47,4 +47,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

ReadMe.md

@@ -9,16 +9,18 @@ Welcome to [Kotlin](http://kotlinlang.org/)! Some handy links:
  * [Kotlin Site](http://kotlinlang.org/)
  * [Getting Started Guide](http://kotlinlang.org/docs/tutorials/getting-started.html)
  * [Try Kotlin](http://try.kotlinlang.org/)
- * [API](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/index.html)
+ * [Kotlin Standard Library](http://kotlinlang.org/api/latest/jvm/stdlib/index.html)
  * [Issue Tracker](http://youtrack.jetbrains.com/issues/KT)
  * [Forum](http://devnet.jetbrains.net/community/kotlin?view=discussions)
  * [Kotlin Blog](http://blog.jetbrains.com/kotlin/)
  * [Follow Kotlin on Twitter](https://twitter.com/kotlin)
+ * [Public Slack channel](http://kotlinslackin.herokuapp.com/)
  * [TeamCity CI build](https://teamcity.jetbrains.com/project.html?tab=projectOverview&projectId=Kotlin)
 
 ## Editing Kotlin
 
  * [Kotlin IntelliJ IDEA Plugin](http://hadihariri.com/2012/02/17/the-kotlin-journey-part-i-getting-things-set-up/)
+ * [Kotlin Eclipse Plugin](http://kotlinlang.org/docs/tutorials/getting-started-eclipse.html)
  * [Kotlin TextMate Bundle](https://github.com/k33g/kotlin-textmate-bundle#readme)
 
 ## Building
@@ -60,7 +62,7 @@ To keep the plugin version in sync with the rest of the team and our [Continuous
 you should install the according to the [instructions below](#plugin-for-contributors).
 
 If you want to have an IntelliJ IDEA installation without the Kotlin plugin which is separate to your default IntelliJ IDEA installation which has the Kotlin
-plugin [see this document](http://devnet.jetbrains.net/docs/DOC-181) which describes how to have mutliple IntelliJ IDEA installations using different configurations and plugin directories.
+plugin [see this document](http://devnet.jetbrains.net/docs/DOC-181) which describes how to have multiple IntelliJ IDEA installations using different configurations and plugin directories.
 
 From this root project there are Run/Debug Configurations for running IDEA or the Compiler Tests for example; so if you want to try out the latest and greatest IDEA plugin
 
@@ -99,15 +101,22 @@ Then update the list of plugins in "Browse Repositories", you'll see two version
 
 # Contributing
 
-We love contributions! There's [lots to do on Kotlin](http://youtrack.jetbrains.com/issues/KT) and on the [standard library](https://youtrack.jetbrains.com/issues/KT?q=Subtask+of%3A+KT-2554+%23Unresolved) so why not chat with us on the [forum](http://devnet.jetbrains.net/community/kotlin?view=discussions) about what you're interested in doing?
+We love contributions! There's [lots to do on Kotlin](http://youtrack.jetbrains.com/issues/KT) and on the
+[standard library](https://youtrack.jetbrains.com/issues/KT?q=Subtask+of%3A+KT-2554+%23Unresolved) so why not chat with us
+about what you're interested in doing? Please join the #kontributors channel in [our Slack chat](http://kotlinslackin.herokuapp.com/)
+and let us know about your plans.
 
 If you want to find some issues to start off with, try [this query](https://youtrack.jetbrains.com/issues?q=tag%3A+%7BUp+For+Grabs%7D+%23Unresolved) which should find all issues that marked as "up-for-grabs".
 
 Currently only committers can assign issues to themselves so just add a comment if you're starting work on it.
 
-A nice gentle way to contribute would be to review the [API docs](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/index.html) and find classes or functions which are not documented very well and submit a patch.
+A nice gentle way to contribute would be to review the [standard library docs](http://kotlinlang.org/api/latest/jvm/stdlib/index.html)
+and find classes or functions which are not documented very well and submit a patch.
 
-In particular it'd be great if all functions included a nice example of how to use it such as for the <a href="http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Collection-extensions.html#filter(kotlin.Function1)">filter()</a> function on Collection. This is implemented using the <a href="https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/src/kotlin/IterablesLazy.kt#L17">@includeFunctionBody</a> macro to include code from a test function. This serves as a double win; the API gets better documented with nice examples to help new users and the code gets more test coverage.
+In particular it'd be great if all functions included a nice example of how to use it such as for the
+<a href="http://kotlinlang.org/api/latest/jvm/stdlib/kotlin/hash-map-of.html">hashMapOf()</a> function.
+This is implemented using the <a href=https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/src/kotlin/collections/Maps.kt#L53">@sample</a>
+macro to include code from a test function. This serves as a double win; the API gets better documented with nice examples to help new users and the code gets more test coverage.
 
 Also the [JavaScript translation](https://github.com/JetBrains/kotlin/blob/master/js/ReadMe.md) could really use your help. See the [JavaScript contribution section](https://github.com/JetBrains/kotlin/blob/master/js/ReadMe.md) for more details.
 

annotations/com/android/tools/idea/gradle/output/parser/annotations.xml

@@ -1,9 +0,0 @@
-<root>
-    <item
-        name='com.android.tools.idea.gradle.output.parser.PatternAwareOutputParser boolean parse(java.lang.String, com.android.tools.idea.gradle.output.parser.OutputLineReader, java.util.List&lt;com.android.tools.idea.gradle.output.GradleMessage&gt;)'>
-        <annotation name='kotlin.jvm.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun parse(line: String, reader: OutputLineReader, messages: MutableList&lt;GradleMessage&gt;): Boolean&quot;"/>
-        </annotation>
-    </item>
-</root>

annotations/com/intellij/codeInsight/editorActions/annotations.xml

@@ -19,13 +19,6 @@
       name='com.intellij.codeInsight.editorActions.CopyPastePostProcessor T extractTransferableData(java.awt.datatransfer.Transferable) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item
-      name='com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List&lt;T&gt; collectTransferableData(com.intellij.psi.PsiFile, com.intellij.openapi.editor.Editor, int[], int[])'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun collectTransferableData(file: PsiFile, editor: Editor, startOffsets: IntArray, endOffsets: IntArray): List&lt;T&gt;&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List&lt;T&gt; collectTransferableData(com.intellij.psi.PsiFile, com.intellij.openapi.editor.Editor, int[], int[]) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
@@ -42,12 +35,6 @@
       name='com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List&lt;T&gt; collectTransferableData(com.intellij.psi.PsiFile, com.intellij.openapi.editor.Editor, int[], int[]) 3'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item
-      name='com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List&lt;T&gt; extractTransferableData(java.awt.datatransfer.Transferable)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value" val="&quot;fun extractTransferableData(content: Transferable): List&lt;T&gt;&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List&lt;T&gt; extractTransferableData(java.awt.datatransfer.Transferable) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
@@ -171,13 +158,6 @@
     <item name='com.intellij.codeInsight.editorActions.ExtendWordSelectionHandler boolean canSelect(com.intellij.psi.PsiElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item
-        name='com.intellij.codeInsight.editorActions.ExtendWordSelectionHandler java.util.List&lt;com.intellij.openapi.util.TextRange&gt; select(com.intellij.psi.PsiElement, java.lang.CharSequence, int, com.intellij.openapi.editor.Editor)'>
-        <annotation name='kotlin.jvm.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List&lt;TextRange&gt;?&quot;"/>
-        </annotation>
-    </item>
     <item
         name='com.intellij.codeInsight.editorActions.ExtendWordSelectionHandler java.util.List&lt;com.intellij.openapi.util.TextRange&gt; select(com.intellij.psi.PsiElement, java.lang.CharSequence, int, com.intellij.openapi.editor.Editor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
@@ -210,13 +190,6 @@
         name='com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase java.util.List&lt;com.intellij.openapi.util.TextRange&gt; expandToWholeLine(java.lang.CharSequence, com.intellij.openapi.util.TextRange, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item
-        name='com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase java.util.List&lt;com.intellij.openapi.util.TextRange&gt; select(com.intellij.psi.PsiElement, java.lang.CharSequence, int, com.intellij.openapi.editor.Editor)'>
-        <annotation name='kotlin.jvm.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List&lt;TextRange&gt;?&quot;"/>
-        </annotation>
-    </item>
     <item
         name='com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase java.util.List&lt;com.intellij.openapi.util.TextRange&gt; select(com.intellij.psi.PsiElement, java.lang.CharSequence, int, com.intellij.openapi.editor.Editor) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/codeInsight/intention/annotations.xml

@@ -1,10 +1,4 @@
 <root>
-  <item
-      name='com.intellij.codeInsight.intention.IntentionAction boolean isAvailable(com.intellij.openapi.project.Project, com.intellij.openapi.editor.Editor, com.intellij.psi.PsiFile)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun isAvailable(project: Project, editor: Editor, file: PsiFile): Boolean&quot;"/>
-    </annotation>
-  </item>
     <item
       name='com.intellij.codeInsight.intention.PsiElementBaseIntentionAction boolean isAvailable(com.intellij.openapi.project.Project, com.intellij.openapi.editor.Editor, com.intellij.psi.PsiElement) 1'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/codeInsight/lookup/annotations.xml

@@ -93,12 +93,6 @@
       name='com.intellij.codeInsight.lookup.LookupElementDecorator void renderElement(com.intellij.codeInsight.lookup.LookupElementPresentation) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item
-      name='com.intellij.codeInsight.lookup.LookupElementRenderer void renderElement(T, com.intellij.codeInsight.lookup.LookupElementPresentation)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun renderElement(element: T?, presentation: LookupElementPresentation): Unit&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.codeInsight.lookup.LookupElementRenderer void renderElement(T, com.intellij.codeInsight.lookup.LookupElementPresentation) 1'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/codeInsight/unwrap/annotations.xml

@@ -3,12 +3,6 @@
       name='com.intellij.codeInsight.unwrap.RangeSplitter java.util.List<com.intellij.openapi.util.TextRange> split(com.intellij.openapi.util.TextRange, java.util.List<com.intellij.openapi.util.TextRange>)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item
-      name='com.intellij.codeInsight.unwrap.ScopeHighlighter ScopeHighlighter(com.intellij.openapi.editor.Editor, com.intellij.util.NotNullFunction&lt;com.intellij.psi.PsiElement,com.intellij.openapi.util.TextRange&gt;)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value" val="&quot;fun ScopeHighlighter(editor: Editor, ranger: NotNullFunction&lt;PsiElement, TextRange&gt;?)&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.codeInsight.unwrap.ScopeHighlighter void highlight(com.intellij.psi.PsiElement, java.util.List&lt;com.intellij.psi.PsiElement&gt;) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/codeInspection/annotations.xml

@@ -1,9 +1,4 @@
 <root>
-  <item name='com.intellij.codeInspection.InspectionToolProvider java.lang.Class[] getInspectionClasses()'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun getInspectionClasses(): Array&lt;Class&lt;out Any?&gt;&gt;&quot;"/>
-    </annotation>
-  </item>
   <item name='com.intellij.codeInspection.SuppressIntentionAction EMPTY_ARRAY'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>

annotations/com/intellij/debugger/actions/annotations.xml

@@ -1,10 +1,4 @@
 <root>
-  <item
-      name='com.intellij.debugger.actions.JvmSmartStepIntoHandler java.util.List&lt;com.intellij.debugger.actions.SmartStepTarget&gt; findSmartStepTargets(com.intellij.debugger.SourcePosition)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value" val="&quot;fun findSmartStepTargets(position: SourcePosition): List&lt;SmartStepTarget&gt;&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.debugger.actions.JvmSmartStepIntoHandler java.util.List&lt;com.intellij.debugger.actions.SmartStepTarget&gt; findSmartStepTargets(com.intellij.debugger.SourcePosition) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/debugger/engine/annotations.xml

@@ -2,13 +2,6 @@
   <item name='com.intellij.debugger.engine.DebugProcessImpl com.intellij.debugger.jdi.VirtualMachineProxyImpl getVirtualMachineProxy()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-    <item
-        name='com.intellij.debugger.engine.FrameExtraVariablesProvider java.util.Set&lt;com.intellij.debugger.engine.evaluation.TextWithImports&gt; collectVariables(com.intellij.debugger.SourcePosition, com.intellij.debugger.engine.evaluation.EvaluationContext, java.util.Set&lt;java.lang.String&gt;)'>
-        <annotation name='kotlin.jvm.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun collectVariables(sourcePosition: SourcePosition?, evalContext: EvaluationContext?, alreadyCollected: Set&lt;String&gt;?): Set&lt;TextWithImports&gt;?&quot;"/>
-        </annotation>
-    </item>
     <item
       name='com.intellij.debugger.engine.MethodFilter boolean locationMatches(com.intellij.debugger.engine.DebugProcessImpl, com.sun.jdi.Location) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/ide/hierarchy/annotations.xml

@@ -8,23 +8,7 @@
   <item name='com.intellij.ide.hierarchy.HierarchyBrowserBaseEx myBuilders'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item name='com.intellij.ide.hierarchy.HierarchyBrowserBaseEx void createTrees(java.util.Map&lt;java.lang.String,javax.swing.JTree&gt;)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun createTrees(trees: MutableMap&lt;String, JTree&gt;): Unit&quot;"/>
-    </annotation>
-  </item>
-  <item name='com.intellij.ide.hierarchy.HierarchyBrowserBaseEx void prependActions(com.intellij.openapi.actionSystem.DefaultActionGroup)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun prependActions(actionGroup: DefaultActionGroup): Unit&quot;"/>
-    </annotation>
-  </item>
   <item name='com.intellij.ide.hierarchy.HierarchyNodeDescriptor myHighlightedText'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item
-      name='com.intellij.ide.hierarchy.HierarchyProvider com.intellij.ide.hierarchy.HierarchyBrowser createHierarchyBrowser(com.intellij.psi.PsiElement)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun createHierarchyBrowser(target: PsiElement): HierarchyBrowser&quot;"/>
-    </annotation>
-  </item>
 </root>

annotations/com/intellij/ide/hierarchy/type/annotations.xml

@@ -1,8 +0,0 @@
-<root>
-  <item
-      name='com.intellij.ide.hierarchy.type.TypeHierarchyBrowser void prependActions(com.intellij.openapi.actionSystem.DefaultActionGroup)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun prependActions(actionGroup: DefaultActionGroup): Unit&quot;"/>
-    </annotation>
-  </item>
-</root>

annotations/com/intellij/ide/util/treeView/smartTree/annotations.xml

@@ -1,8 +0,0 @@
-<root>
-  <item
-      name='com.intellij.ide.util.treeView.smartTree.NodeProvider java.util.Collection&lt;T&gt; provideNodes(com.intellij.ide.util.treeView.smartTree.TreeElement)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value" val="&quot;fun provideNodes(node: TreeElement): Collection&lt;T&gt;&quot;"/>
-    </annotation>
-  </item>
-</root>

annotations/com/intellij/openapi/util/annotations.xml

@@ -3,22 +3,7 @@
       name='com.intellij.openapi.util.Conditions com.intellij.openapi.util.Condition<T> or(com.intellij.openapi.util.Condition<T>, com.intellij.openapi.util.Condition<T>)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-    <item name='com.intellij.openapi.util.Key T get(com.intellij.openapi.util.UserDataHolder, T)'>
-        <annotation name='kotlin.jvm.KotlinSignature'>
-            <val name="value" val="&quot;fun get(holder: UserDataHolder?, defaultValue: T): T&quot;"/>
-        </annotation>
-    </item>
     <item name='com.intellij.openapi.util.Key com.intellij.openapi.util.Key&lt;T&gt; create(java.lang.String)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item name='com.intellij.openapi.util.Pair A getFirst()'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value" val="&quot;fun getFirst(): A&quot;"/>
-    </annotation>
-  </item>
-  <item name='com.intellij.openapi.util.Pair B getSecond()'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value" val="&quot;fun getSecond(): B&quot;"/>
-    </annotation>
-  </item>
 </root>

annotations/com/intellij/platform/annotations.xml

@@ -1,10 +1,4 @@
 <root>
-  <item
-      name='com.intellij.platform.ProjectTemplatesFactory com.intellij.platform.ProjectTemplate[] createTemplates(java.lang.String, com.intellij.ide.util.projectWizard.WizardContext)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value" val="&quot;fun createTemplates(group: String, context: WizardContext?): Array&lt;out ProjectTemplate&gt;&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.platform.ProjectTemplatesFactory com.intellij.platform.ProjectTemplate[] createTemplates(java.lang.String, com.intellij.ide.util.projectWizard.WizardContext) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/psi/search/searches/annotations.xml

@@ -19,26 +19,13 @@
       name='com.intellij.psi.search.searches.OverridingMethodsSearch com.intellij.util.Query<com.intellij.psi.PsiMethod> search(com.intellij.psi.PsiMethod, com.intellij.psi.search.SearchScope, boolean)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item
-      name='com.intellij.psi.search.searches.ReferencesSearch com.intellij.util.Query&lt;com.intellij.psi.PsiReference&gt; search(com.intellij.psi.PsiElement)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun search(element: PsiElement): Query&lt;PsiReference&gt;&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.psi.search.searches.ReferencesSearch com.intellij.util.Query&lt;com.intellij.psi.PsiReference&gt; search(com.intellij.psi.PsiElement, com.intellij.psi.search.SearchScope)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun search(element: PsiElement, searchScope: SearchScope): Query&lt;PsiReference&gt;&quot;"/>
-    </annotation>
   </item>
   <item
       name='com.intellij.psi.search.searches.ReferencesSearch com.intellij.util.Query&lt;com.intellij.psi.PsiReference&gt; search(com.intellij.psi.PsiElement, com.intellij.psi.search.SearchScope, boolean)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun search(element: PsiElement, searchScope: SearchScope, ignoreAccessScope: Boolean): Query&lt;PsiReference&gt;&quot;"/>
-    </annotation>
   </item>
   <item
       name='com.intellij.psi.search.searches.ReferencesSearch com.intellij.util.Query&lt;com.intellij.psi.PsiReference&gt; search(com.intellij.psi.search.searches.ReferencesSearch.SearchParameters)'>

annotations/com/intellij/refactoring/annotations.xml

@@ -1,10 +1,4 @@
 <root>
-  <item
-      name='com.intellij.refactoring.BaseRefactoringProcessor boolean preprocessUsages(com.intellij.openapi.util.Ref&lt;com.intellij.usageView.UsageInfo[]&gt;)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value" val="&quot;fun preprocessUsages(refUsages: Ref&lt;Array&lt;UsageInfo&gt;&gt;): Boolean&quot;"/>
-    </annotation>
-  </item>
   <item name='com.intellij.refactoring.BaseRefactoringProcessor myProject'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>

annotations/com/intellij/refactoring/move/annotations.xml

@@ -7,13 +7,6 @@
       name='com.intellij.refactoring.move.MoveHandlerDelegate boolean isValidTarget(com.intellij.psi.PsiElement, com.intellij.psi.PsiElement[]) 1'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item
-      name='com.intellij.refactoring.move.MoveHandlerDelegate boolean tryToMove(com.intellij.psi.PsiElement, com.intellij.openapi.project.Project, com.intellij.openapi.actionSystem.DataContext, com.intellij.psi.PsiReference, com.intellij.openapi.editor.Editor)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun tryToMove(element: PsiElement, project: Project, dataContext: DataContext?, reference: PsiReference?, editor: Editor?): Boolean&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.refactoring.move.MoveHandlerDelegate com.intellij.psi.PsiElement[] adjustForMove(com.intellij.openapi.project.Project, com.intellij.psi.PsiElement[], com.intellij.psi.PsiElement) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/refactoring/move/moveFilesOrDirectories/annotations.xml

@@ -1,11 +1,4 @@
 <root>
-  <item
-      name='com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler java.util.List&lt;com.intellij.usageView.UsageInfo&gt; findUsages(com.intellij.psi.PsiFile, com.intellij.psi.PsiDirectory, boolean, boolean)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun findUsages(psiFile: PsiFile, newParent: PsiDirectory, searchInComments: Boolean, searchInNonJavaFiles: Boolean): List&lt;UsageInfo&gt;?&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler void prepareMovedFile(com.intellij.psi.PsiFile, com.intellij.psi.PsiDirectory, java.util.Map&lt;com.intellij.psi.PsiElement,com.intellij.psi.PsiElement&gt;) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/refactoring/rename/annotations.xml

@@ -1,11 +1,4 @@
 <root>
-  <item
-      name='com.intellij.refactoring.rename.RenamePsiElementProcessor void findCollisions(com.intellij.psi.PsiElement, java.lang.String, java.util.Map&lt;? extends com.intellij.psi.PsiElement,java.lang.String&gt;, java.util.List&lt;com.intellij.usageView.UsageInfo&gt;)'>
-    <annotation name='kotlin.jvm.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun findCollisions(element: PsiElement?, newName: String?, allRenames: Map&lt;out PsiElement?, String&gt;, result: MutableList&lt;UsageInfo&gt;): Unit&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.refactoring.rename.RenamePsiElementProcessor void findCollisions(com.intellij.psi.PsiElement, java.lang.String, java.util.Map&lt;? extends com.intellij.psi.PsiElement,java.lang.String&gt;, java.util.List&lt;com.intellij.usageView.UsageInfo&gt;) 2'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
@@ -22,13 +15,6 @@
       name='com.intellij.refactoring.rename.RenamePsiElementProcessor void findExistingNameConflicts(com.intellij.psi.PsiElement, java.lang.String, com.intellij.util.containers.MultiMap&lt;com.intellij.psi.PsiElement,java.lang.String&gt;, java.util.Map&lt;com.intellij.psi.PsiElement,java.lang.String&gt;) 2'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item
-      name='com.intellij.refactoring.rename.RenamePsiElementProcessor void prepareRenaming(com.intellij.psi.PsiElement, java.lang.String, java.util.Map&lt;com.intellij.psi.PsiElement,java.lang.String&gt;, com.intellij.psi.search.SearchScope)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun prepareRenaming(element: PsiElement?, newName: String?, allRenames: MutableMap&lt;PsiElement, String&gt;, scope: SearchScope): Unit&quot;"/>
-    </annotation>
-  </item>
   <item
       name='com.intellij.refactoring.rename.RenamePsiElementProcessor void prepareRenaming(com.intellij.psi.PsiElement, java.lang.String, java.util.Map&lt;com.intellij.psi.PsiElement,java.lang.String&gt;, com.intellij.psi.search.SearchScope) 2'>
     <annotation name='org.jetbrains.annotations.NotNull'/>

annotations/com/intellij/refactoring/safeDelete/annotations.xml

@@ -1,98 +0,0 @@
-<root>
-  <item
-      name='com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate void createUsageInfoForParameter(com.intellij.psi.PsiReference, java.util.List&lt;com.intellij.usageView.UsageInfo&gt;, com.intellij.psi.PsiParameter, com.intellij.psi.PsiMethod)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun createUsageInfoForParameter(reference: PsiReference, usages: MutableList&lt;UsageInfo&gt;, parameter: PsiParameter, method: PsiMethod): Unit&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.JavaSafeDeleteProcessor java.util.Collection&lt;? extends com.intellij.psi.PsiElement&gt; getElementsToSearch(com.intellij.psi.PsiElement, com.intellij.openapi.module.Module, java.util.Collection&lt;com.intellij.psi.PsiElement&gt;)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun getElementsToSearch(element: PsiElement, module: Module?, allElementsToDelete: Collection&lt;PsiElement&gt;): Collection&lt;out PsiElement&gt;?&quot;"/>
-    </annotation>
-  </item>
-  <item name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate boolean handlesElement(com.intellij.psi.PsiElement)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun handlesElement(element: PsiElement): Boolean&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate boolean isToSearchForTextOccurrences(com.intellij.psi.PsiElement)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun isToSearchForTextOccurrences(element: PsiElement): Boolean&quot;"/>
-    </annotation>
-  </item>
-  <item name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate boolean isToSearchInComments(com.intellij.psi.PsiElement)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun isToSearchInComments(element: PsiElement): Boolean&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate com.intellij.refactoring.safeDelete.NonCodeUsageSearchInfo findUsages(com.intellij.psi.PsiElement, com.intellij.psi.PsiElement[], java.util.List&lt;com.intellij.usageView.UsageInfo&gt;)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun findUsages(element: PsiElement, allElementsToDelete: Array&lt;out PsiElement&gt;, result: MutableList&lt;UsageInfo&gt;): NonCodeUsageSearchInfo?&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate com.intellij.usageView.UsageInfo[] preprocessUsages(com.intellij.openapi.project.Project, com.intellij.usageView.UsageInfo[])'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun preprocessUsages(project: Project, usages: Array&lt;out UsageInfo&gt;): Array&lt;UsageInfo&gt;?&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate java.util.Collection&lt;? extends com.intellij.psi.PsiElement&gt; getElementsToSearch(com.intellij.psi.PsiElement, java.util.Collection&lt;com.intellij.psi.PsiElement&gt;)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun getElementsToSearch(element: PsiElement, allElementsToDelete: Collection&lt;PsiElement&gt;): Collection&lt;out PsiElement&gt;?&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate java.util.Collection&lt;com.intellij.psi.PsiElement&gt; getAdditionalElementsToDelete(com.intellij.psi.PsiElement, java.util.Collection&lt;com.intellij.psi.PsiElement&gt;, boolean)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun getAdditionalElementsToDelete(element: PsiElement, allElementsToDelete: Collection&lt;PsiElement&gt;, askUser: Boolean): MutableCollection&lt;PsiElement&gt;?&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate java.util.Collection&lt;java.lang.String&gt; findConflicts(com.intellij.psi.PsiElement, com.intellij.psi.PsiElement[])'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun findConflicts(element: PsiElement, allElementsToDelete: Array&lt;out PsiElement&gt;): MutableCollection&lt;String&gt;?&quot;"/>
-    </annotation>
-  </item>
-  <item name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate void prepareForDeletion(com.intellij.psi.PsiElement)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun prepareForDeletion(element: PsiElement): Unit&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate void setToSearchForTextOccurrences(com.intellij.psi.PsiElement, boolean)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun setToSearchForTextOccurrences(element: PsiElement, enabled: Boolean): Unit&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate void setToSearchInComments(com.intellij.psi.PsiElement, boolean)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun setToSearchInComments(element: PsiElement, enabled: Boolean): Unit&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegateBase java.util.Collection&lt;? extends com.intellij.psi.PsiElement&gt; getElementsToSearch(com.intellij.psi.PsiElement, com.intellij.openapi.module.Module, java.util.Collection&lt;com.intellij.psi.PsiElement&gt;)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun getElementsToSearch(element: PsiElement, module: Module?, allElementsToDelete: Collection&lt;PsiElement&gt;): Collection&lt;out PsiElement&gt;?&quot;"/>
-    </annotation>
-  </item>
-  <item
-      name='com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegateBase java.util.Collection&lt;? extends com.intellij.psi.PsiElement&gt; getElementsToSearch(com.intellij.psi.PsiElement, java.util.Collection&lt;com.intellij.psi.PsiElement&gt;)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value"
-           val="&quot;fun getElementsToSearch(element: PsiElement, allElementsToDelete: Collection&lt;PsiElement&gt;): Collection&lt;out PsiElement&gt;?&quot;"/>
-    </annotation>
-  </item>
-</root>

annotations/com/intellij/testFramework/fixtures/annotations.xml

@@ -6,11 +6,6 @@
       name='com.intellij.testFramework.fixtures.CodeInsightTestFixture com.intellij.openapi.vfs.VirtualFile copyDirectoryToProject(java.lang.String, java.lang.String)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item name='com.intellij.testFramework.fixtures.CodeInsightTestFixture void assertPreferredCompletionItems(int, java.lang.String...)'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun assertPreferredCompletionItems(selected: Int, vararg expected: String)&quot;"/>
-    </annotation>
-  </item>
   <item name='com.intellij.testFramework.fixtures.IdeaProjectTestFixture com.intellij.openapi.project.Project getProject()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>

annotations/com/intellij/ui/classFilter/annotations.xml

@@ -1,8 +0,0 @@
-<root>
-    <item
-        name='com.intellij.ui.classFilter.DebuggerClassFilterProvider java.util.List&lt;com.intellij.ui.classFilter.ClassFilter&gt; getFilters()'>
-        <annotation name='kotlin.jvm.KotlinSignature'>
-            <val name="value" val="&quot;fun getFilters(): List&lt;ClassFilter&gt;?&quot;"/>
-        </annotation>
-    </item>
-</root>

annotations/com/intellij/xdebugger/settings/annotations.xml

@@ -1,9 +0,0 @@
-<root>
-    <item
-        name='com.intellij.xdebugger.settings.XDebuggerSettings java.util.Collection&lt;? extends com.intellij.openapi.options.Configurable&gt; createConfigurables(com.intellij.xdebugger.settings.DebuggerSettingsCategory)'>
-        <annotation name='kotlin.jvm.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun createConfigurables(category: DebuggerSettingsCategory): Collection&lt;out Configurable?&gt;&quot;"/>
-        </annotation>
-    </item>
-</root>

ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt

@@ -52,7 +52,7 @@ public class Kotlin2JsTask : KotlinCompilerBaseTask() {
         // TODO: write test
         library?.let {
             args.add("-library-files")
-            args.add(it.list().map { File(it).canonicalPath }.join(separator = ","))
+            args.add(it.list().joinToString(separator = ",") { File(it).canonicalPath })
         }
 
         outputPrefix?.let {

ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt

@@ -23,19 +23,11 @@ import java.io.File.pathSeparator
 public class Kotlin2JvmTask : KotlinCompilerBaseTask() {
     override val compilerFqName = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"
 
-    public var externalAnnotations: Path? = null
     public var includeRuntime: Boolean = true
     public var moduleName: String? = null
 
     private var compileClasspath: Path? = null
 
-    public fun createExternalAnnotations(): Path {
-        if (externalAnnotations == null) {
-            externalAnnotations = Path(getProject())
-        }
-        return externalAnnotations!!.createPath()
-    }
-
     public fun setClasspath(classpath: Path) {
         if (compileClasspath == null) {
             compileClasspath = classpath
@@ -62,12 +54,7 @@ public class Kotlin2JvmTask : KotlinCompilerBaseTask() {
 
         compileClasspath?.let {
             args.add("-classpath")
-            args.add(it.list().join(pathSeparator))
-        }
-
-        externalAnnotations?.let {
-            args.add("-annotations")
-            args.add(it.list().join(pathSeparator))
+            args.add(it.list().joinToString(pathSeparator))
         }
 
 

ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.java

@@ -1,165 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.ant;
-
-import kotlin.KotlinPackage;
-import kotlin.jvm.functions.Function1;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.MagicNames;
-import org.apache.tools.ant.taskdefs.Javac;
-import org.apache.tools.ant.taskdefs.compilers.Javac13;
-import org.apache.tools.ant.taskdefs.condition.AntVersion;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.apache.tools.ant.Project.MSG_WARN;
-
-public class KotlinCompilerAdapter extends Javac13 {
-    private static final List<String> KOTLIN_EXTENSIONS = Arrays.asList("kt", "kts");
-
-    private Path externalAnnotations;
-
-    private String moduleName;
-
-    public List<Commandline.Argument> additionalArguments = new ArrayList<Commandline.Argument>(0);
-
-    public void setExternalAnnotations(Path externalAnnotations) {
-        this.externalAnnotations = externalAnnotations;
-    }
-
-    public void setModuleName(String moduleName) {
-        this.moduleName = moduleName;
-    }
-
-    public Path createExternalAnnotations() {
-        if (externalAnnotations == null) {
-            externalAnnotations = new Path(getProject());
-        }
-        return externalAnnotations.createPath();
-    }
-
-    public Commandline.Argument createCompilerArg() {
-        Commandline.Argument argument = new Commandline.Argument();
-        additionalArguments.add(argument);
-        return argument;
-    }
-
-    @Override
-    public String[] getSupportedFileExtensions() {
-        List<String> result = KotlinPackage.plus(Arrays.asList(super.getSupportedFileExtensions()), KOTLIN_EXTENSIONS);
-        //noinspection SSBasedInspection
-        return result.toArray(new String[result.size()]);
-    }
-
-    @Override
-    public boolean execute() throws BuildException {
-        Javac javac = getJavac();
-
-        checkAntVersion();
-
-        Kotlin2JvmTask kotlinc = new Kotlin2JvmTask();
-        kotlinc.setFailOnError(javac.getFailonerror());
-        kotlinc.setOutput(javac.getDestdir());
-
-        Path classpath = javac.getClasspath();
-        if (classpath != null) {
-            kotlinc.setClasspath(classpath);
-        }
-
-        // We use the provided src dir instead of compileList, because the latter is insane:
-        // it is constructed only of sources which are newer than classes with the same name
-        kotlinc.setSrc(javac.getSrcdir());
-
-        kotlinc.setExternalAnnotations(externalAnnotations);
-
-        if (moduleName == null) {
-            moduleName = AntPackage.getDefaultModuleName(javac);
-        }
-        kotlinc.setModuleName(moduleName);
-
-        kotlinc.getAdditionalArguments().addAll(additionalArguments);
-
-        // Javac13#execute passes everything in compileList to javac, which doesn't recognize .kt files
-        File[] compileListForJavac = filterOutKotlinSources(compileList);
-
-        boolean hasKotlinFilesInSources = compileListForJavac.length < compileList.length;
-
-        if (hasKotlinFilesInSources) {
-            kotlinc.execute();
-            if (!Integer.valueOf(0).equals(kotlinc.getExitCode())) {
-                // Don't run javac if failOnError = false and there were errors on Kotlin sources
-                return false;
-            }
-        }
-        else {
-            // This is needed for addRuntimeToJavacClasspath, where kotlinc arguments will be used.
-            kotlinc.fillArguments();
-        }
-
-        javac.log("Running javac...");
-
-        compileList = compileListForJavac;
-
-        addRuntimeToJavacClasspath(kotlinc);
-
-        return compileList.length == 0 || super.execute();
-    }
-
-    private void addRuntimeToJavacClasspath(@NotNull Kotlin2JvmTask kotlinc) {
-        for (String arg : kotlinc.getArgs()) {
-            // If "-no-stdlib" was specified explicitly, probably the user also wanted the javac classpath to not have it
-            if ("-no-stdlib".equals(arg)) return;
-        }
-
-        if (compileClasspath == null) {
-            compileClasspath = new Path(getProject());
-        }
-        compileClasspath.add(new Path(getProject(), KotlinAntTaskUtil.INSTANCE$.getRuntimeJar().getAbsolutePath()));
-    }
-
-    private void checkAntVersion() {
-        AntVersion checkVersion = new AntVersion();
-        checkVersion.setAtLeast("1.8.2");
-        if (!checkVersion.eval()) {
-            getJavac().log("<withKotlin> task requires Ant of version at least 1.8.2 to operate reliably. " +
-                           "Please upgrade or, as a workaround, make sure you have at least one Java source and " +
-                           "the output directory is clean before running this task. " +
-                           "You have: " + getProject().getProperty(MagicNames.ANT_VERSION), MSG_WARN);
-        }
-    }
-
-    @NotNull
-    private static File[] filterOutKotlinSources(@NotNull File[] files) {
-        List<File> nonKotlinSources = KotlinPackage.filterNot(files, new Function1<File, Boolean>() {
-            @Override
-            public Boolean invoke(File file) {
-                for (String extension : KOTLIN_EXTENSIONS) {
-                    if (file.getPath().endsWith("." + extension)) return true;
-                }
-                return false;
-            }
-        });
-
-        return nonKotlinSources.toArray(new File[nonKotlinSources.size()]);
-    }
-}

ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt

@@ -0,0 +1,131 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.ant
+
+import org.apache.tools.ant.BuildException
+import org.apache.tools.ant.MagicNames
+import org.apache.tools.ant.Project.MSG_WARN
+import org.apache.tools.ant.taskdefs.compilers.Javac13
+import org.apache.tools.ant.taskdefs.condition.AntVersion
+import org.apache.tools.ant.types.Commandline
+import org.apache.tools.ant.types.Path
+import java.io.File
+import java.util.*
+
+class KotlinCompilerAdapter : Javac13() {
+    var moduleName: String? = null
+
+    var additionalArguments: MutableList<Commandline.Argument> = ArrayList(0)
+
+    fun createCompilerArg(): Commandline.Argument {
+        val argument = Commandline.Argument()
+        additionalArguments.add(argument)
+        return argument
+    }
+
+    override fun getSupportedFileExtensions(): Array<String> {
+        return super.getSupportedFileExtensions() + KOTLIN_EXTENSIONS
+    }
+
+    @Throws(BuildException::class)
+    override fun execute(): Boolean {
+        val javac = javac
+
+        checkAntVersion()
+
+        val kotlinc = Kotlin2JvmTask()
+        kotlinc.failOnError = javac.failonerror
+        kotlinc.output = javac.destdir
+
+        val classpath = javac.classpath
+        if (classpath != null) {
+            kotlinc.setClasspath(classpath)
+        }
+
+        // We use the provided src dir instead of compileList, because the latter is insane:
+        // it is constructed only of sources which are newer than classes with the same name
+        kotlinc.src = javac.srcdir
+
+        if (moduleName == null) {
+            moduleName = javac.defaultModuleName
+        }
+        kotlinc.moduleName = moduleName
+
+        kotlinc.additionalArguments.addAll(additionalArguments)
+
+        // Javac13#execute passes everything in compileList to javac, which doesn't recognize .kt files
+        val compileListForJavac = filterOutKotlinSources(compileList)
+
+        val hasKotlinFilesInSources = compileListForJavac.size() < compileList.size()
+
+        if (hasKotlinFilesInSources) {
+            kotlinc.execute()
+            if (kotlinc.exitCode != 0) {
+                // Don't run javac if failOnError = false and there were errors on Kotlin sources
+                return false
+            }
+        }
+        else {
+            // This is needed for addRuntimeToJavacClasspath, where kotlinc arguments will be used.
+            kotlinc.fillArguments()
+        }
+
+        javac.log("Running javac...")
+
+        compileList = compileListForJavac
+
+        addRuntimeToJavacClasspath(kotlinc)
+
+        return compileList.isEmpty() || super.execute()
+    }
+
+    private fun addRuntimeToJavacClasspath(kotlinc: Kotlin2JvmTask) {
+        for (arg in kotlinc.args) {
+            // If "-no-stdlib" was specified explicitly, probably the user also wanted the javac classpath to not have it
+            if ("-no-stdlib" == arg) return
+        }
+
+        if (compileClasspath == null) {
+            compileClasspath = Path(getProject())
+        }
+        compileClasspath.add(Path(getProject(), KotlinAntTaskUtil.runtimeJar.absolutePath))
+    }
+
+    private fun checkAntVersion() {
+        val checkVersion = AntVersion()
+        checkVersion.atLeast = "1.8.2"
+        if (!checkVersion.eval()) {
+            javac.log("<withKotlin> task requires Ant of version at least 1.8.2 to operate reliably. " +
+                      "Please upgrade or, as a workaround, make sure you have at least one Java source and " +
+                      "the output directory is clean before running this task. " +
+                      "You have: " + getProject().getProperty(MagicNames.ANT_VERSION), MSG_WARN)
+        }
+    }
+
+    companion object {
+        private val KOTLIN_EXTENSIONS = Arrays.asList("kt", "kts")
+
+        private fun filterOutKotlinSources(files: Array<File>): Array<File> {
+            return files.filterNot {
+                for (extension in KOTLIN_EXTENSIONS) {
+                    if (it.path.endsWith("." + extension)) return@filterNot true
+                }
+                false
+            }.toTypedArray()
+        }
+    }
+}

ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt

@@ -27,7 +27,7 @@ import java.io.PrintStream
 public abstract class KotlinCompilerBaseTask : Task() {
     protected abstract val compilerFqName: String
 
-    protected val args: MutableList<String> = arrayListOf()
+    public val args: MutableList<String> = arrayListOf()
 
     public var src: Path? = null
     public var output: File? = null
@@ -40,7 +40,7 @@ public abstract class KotlinCompilerBaseTask : Task() {
 
     public val additionalArguments: MutableList<Commandline.Argument> = arrayListOf()
 
-    internal var exitCode: Int? = null
+    public var exitCode: Int? = null
 
     public fun createSrc(): Path {
         val srcPath = src

build.xml

@@ -1,6 +1,4 @@
 <project name="Kotlin" default="dist" xmlns:if="ant:if" xmlns:unless="ant:unless">
-    <include file="jslib_files.xml" />
-
     <property file="resources/kotlinManifest.properties"/>
 
     <!-- Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build -->
@@ -16,6 +14,7 @@
     <property name="bootstrap.reflect" value="${bootstrap.compiler.home}/lib/kotlin-reflect.jar"/>
 
     <property name="output" value="${basedir}/dist"/>
+    <property name="intermediate-sources" value="out/src" />
     <property name="kotlin-home" value="${output}/kotlinc"/>
     <property name="build.number" value="snapshot"/>
     <property name="bootstrap.build.no.tests" value="false"/>
@@ -26,8 +25,6 @@
 
     <property name="java.target" value="1.6"/>
 
-    <property name="external.annotations.path" value="${basedir}/annotations"/>
-
     <property name="dependencies.dir" value="${basedir}/dependencies"/>
 
     <condition property="bootstrap.or.local.build" value="true">
@@ -39,6 +36,8 @@
         </or>
     </condition>
 
+    <include file="jslib_files.xml" />
+
     <!--
     The compiler produced on the first step of the build (Bootstrap No Tests) is only guaranteed to work against the OLD runtime
     located in dependencies/bootstrap-compiler/.../kotlin-runtime.jar, because the newly built compiler is just a Kotlin application,
@@ -86,14 +85,14 @@
         <include name="compiler/builtins-serializer/src"/>
         <include name="compiler/cli/src"/>
         <include name="compiler/cli/cli-common/src"/>
-        <include name="compiler/rmi/rmi-server/src"/>
-        <include name="compiler/rmi/rmi-interface/src"/>
+        <include name="compiler/conditional-preprocessor/src/"/>
         <include name="compiler/container/src"/>
         <include name="compiler/frontend/src"/>
         <include name="compiler/frontend.java/src"/>
         <include name="compiler/light-classes/src"/>
         <include name="compiler/plugin-api/src"/>
-        <include name="plugins/annotation-collector/src"/>
+        <include name="compiler/rmi/rmi-server/src"/>
+        <include name="compiler/rmi/rmi-interface/src"/>
         <include name="compiler/serialization/src"/>
         <include name="compiler/util/src"/>
         <include name="js/js.dart-ast/src"/>
@@ -102,6 +101,7 @@
         <include name="js/js.inliner/src"/>
         <include name="js/js.parser/src"/>
         <include name="js/js.serializer/src"/>
+        <include name="plugins/annotation-collector/src"/>
     </dirset>
 
     <property name="idea.out" value="${basedir}/out/production"/>
@@ -117,6 +117,7 @@
         <include name="backend-common/**"/>
         <include name="cli/**"/>
         <include name="cli-common/**"/>
+        <include name="conditional-preprocessor/**"/>
         <include name="rmi-server/**"/>
         <include name="rmi-interface/**"/>
         <include name="util/**"/>
@@ -202,6 +203,7 @@
             <fileset dir="compiler/builtins-serializer/src"/>
             <fileset dir="compiler/cli/src"/>
             <fileset dir="compiler/cli/cli-common/src"/>
+            <fileset dir="compiler/conditional-preprocessor/src"/>
             <fileset dir="compiler/rmi/rmi-server/src"/>
             <fileset dir="compiler/rmi/rmi-interface/src"/>
             <fileset dir="compiler/container/src"/>
@@ -304,6 +306,8 @@
         <property name="compiled.stdlib.meta.js" value="stdlib.meta.js"/>
         <property name="stdlib.js.dir" value="${basedir}/js/js.translator/testData"/>
 
+        <kotlin-pp src="libraries/stdlib/src" output="${intermediate-sources}/stdlib/js" profile="JS" />
+
         <new-kotlin2js output="${output}/${compiled.builtins.js}">
             <src>
                 <fileset refid="kotlin.builtin.files"/>
@@ -446,7 +450,7 @@
             </assertions>
             <arg value="-cp"/>
             <arg value="${bootstrap.compiler.home}/lib/kotlin-compiler.jar"/>
-            <arg value="org.jetbrains.kotlin.serialization.builtins.BuiltinsPackage"/>
+            <arg value="org.jetbrains.kotlin.serialization.builtins.RunKt"/>
             <arg value="${output}/builtins"/>
             <arg value="core/builtins/native"/>
             <arg value="core/builtins/src"/>
@@ -464,8 +468,10 @@
                     <include name="kotlin/**"/>
                     <exclude name="kotlin/internal/**"/>
                 </fileset>
+                <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
+                <fileset dir="${basedir}/compiler/cli/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/resources" includes="kotlinManifest.properties"/>
 
                 <fileset dir="idea/src">
@@ -476,7 +482,7 @@
 
                 <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
                 <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
-                <zipfileset src="${idea.sdk}/lib/jna-utils.jar"/>
+                <zipfileset src="${idea.sdk}/lib/jna-platform.jar"/>
                 <zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
                 <zipfileset src="${idea.sdk}/jps/jps-model.jar"/>
                 <zipfileset src="${dependencies.dir}/jline.jar"/>
@@ -522,7 +528,7 @@
 
         <javac2 destdir="${output}/classes/compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
-            <withKotlin externalannotations="${external.annotations.path}" modulename="kotlin-compiler"/>
+            <withKotlin modulename="kotlin-compiler"/>
             <skip pattern="kotlin/jvm/internal/.*"/>
             <src refid="compilerSources.path"/>
             <classpath refid="classpath"/>
@@ -546,11 +552,21 @@
             <proguard configuration="${basedir}/compiler/compiler.pro"/>
         </sequential>
 
-        <jar jarfile="${output}/kotlin-compiler-for-maven.jar">
+        <jar jarfile="${output}/kotlin-compiler-for-maven.jar" duplicate="preserve">
+            <patternset id="lib.metainf.patternset">
+                <include name="**"/>
+                <exclude name="META-INF/build.txt"/>
+                <exclude name="META-INF/MANIFEST.MF"/>
+            </patternset>
+
             <!-- TODO: don't include both to the jar: it's impossible to test changes to core in the local maven build without bootstrap -->
             <zipfileset src="${kotlin-home}/lib/kotlin-compiler.jar" includes="**"/>
-            <zipfileset src="${bootstrap.runtime}" includes="**" />
-            <zipfileset src="${bootstrap.reflect}" includes="**" />
+            <zipfileset src="${bootstrap.runtime}">
+                <patternset refid="lib.metainf.patternset"/>
+            </zipfileset>
+            <zipfileset src="${bootstrap.reflect}">
+                <patternset refid="lib.metainf.patternset"/>
+            </zipfileset>
 
             <manifest>
                 <attribute name="Built-By" value="${manifest.impl.vendor}"/>
@@ -575,11 +591,13 @@
                 <pathelement path="${bootstrap.runtime}"/>
                 <pathelement path="${bootstrap.reflect}"/>
                 <pathelement path="${kotlin-home}/lib/kotlin-compiler.jar"/>
+                <pathelement path="${dependencies.dir}/native-platform-uberjar.jar"/>
             </classpath>
         </kotlinc>
 
         <jar destfile="${kotlin-home}/lib/kotlinr.jar">
             <fileset dir="${output}/classes/kotlinr"/>
+            <zipfileset src="${dependencies.dir}/native-platform-uberjar.jar" includes="**" />
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
         </jar>
     </target>
@@ -611,7 +629,7 @@
         <cleandir dir="${output}/classes/ant"/>
         <javac2 destdir="${output}/classes/ant" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
-            <withKotlin externalannotations="${external.annotations.path}" modulename="kotlin-ant-tools"/>
+            <withKotlin modulename="kotlin-ant-tools"/>
             <skip pattern="kotlin/jvm/internal/.*"/>
             <src>
                 <dirset dir="${basedir}/ant">
@@ -671,6 +689,7 @@
     <macrodef name="new-kotlinc">
         <attribute name="output"/>
         <attribute name="moduleName"/>
+        <attribute name="additionalOptions" default=""/>
         <element name="src"/>
         <element name="class-path"/>
 
@@ -703,7 +722,7 @@
                 <arg value="-d"/>
                 <arg value="@{output}"/>
                 <arg value="-no-stdlib"/>
-                <arg value="-Xmultifile-package-facades"/>
+                <arg line="@{additionalOptions}"/>
                 <arg value="-classpath"/>
                 <arg value="${toString:classpath.path}"/>
                 <arg value="-module-name"/>
@@ -722,6 +741,29 @@
         </sequential>
     </macrodef>
 
+    <macrodef name="kotlin-pp">
+        <attribute name="src"/>
+        <attribute name="output"/>
+        <attribute name="profile"/>
+
+        <sequential>
+            <java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true" maxmemory="${max.heap.size.for.forked.jvm}">
+                <classpath>
+                    <pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
+                </classpath>
+                <assertions>
+                    <enable/>
+                </assertions>
+                <arg value="-cp"/>
+                <arg value="${kotlin-home}/lib/kotlin-compiler.jar"/>
+                <arg value="org.jetbrains.kotlin.preprocessor.PreprocessorCLI"/>
+                <arg value="@{src}"/>
+                <arg value="@{output}"/>
+                <arg value="@{profile}"/>
+            </java>
+        </sequential>
+    </macrodef>
+
     <target name="builtins">
         <new-kotlinc output="${output}/classes/builtins" moduleName="kotlin-builtins">
             <src>
@@ -817,6 +859,7 @@
 
         <pack-runtime-jar jar-dir="${output}" jar-name="kotlin-reflect-before-jarjar.jar" implementation-title="${manifest.impl.title.kotlin.jvm.reflect}">
             <jar-content>
+                <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="META-INF/services/**"/>
                 <fileset dir="${output}/classes/reflection"/>
                 <fileset dir="${output}/classes/core"/>
                 <zipfileset src="${protobuf-lite.jar}"/>
@@ -917,7 +960,7 @@
 
         <javac2 destdir="${output}/classes/idea-analysis" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
-            <withKotlin externalannotations="${external.annotations.path}" modulename="kotlin-for-upsource"/>
+            <withKotlin modulename="kotlin-for-upsource"/>
             <skip pattern="kotlin/jvm/internal/.*"/>
             <src>
                 <dirset dir="${basedir}/idea/ide-common" includes="src"/>
@@ -941,8 +984,10 @@
                 <include name="kotlin/**"/>
                 <exclude name="kotlin/internal/**"/>
             </fileset>
+            <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="META-INF/services/**"/>
             <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
             <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
+            <fileset dir="${basedir}/compiler/cli/src" includes="META-INF/services/**"/>
 
             <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
             <zipgroupfileset file="${kotlin-home}/lib/kotlin-runtime.jar"/>

compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java

@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.android.tests.OutputUtils;
 import org.jetbrains.kotlin.android.tests.PathManager;
 import org.jetbrains.kotlin.android.tests.run.RunResult;
 import org.jetbrains.kotlin.android.tests.run.RunUtils;
-import org.jetbrains.kotlin.utils.UtilsPackage;
+import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -90,7 +90,7 @@ public class AntRunner {
                 Thread.sleep(20000);
             }
             catch (InterruptedException e) {
-                throw UtilsPackage.rethrow(e);
+                throw ExceptionUtilsKt.rethrow(e);
             }
             return false;
         }

compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java

@@ -23,16 +23,16 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
-import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage;
+import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
 import org.jetbrains.kotlin.codegen.CodegenTestFiles;
 import org.jetbrains.kotlin.codegen.GenerationUtils;
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil;
-import org.jetbrains.kotlin.idea.JetFileType;
-import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.idea.KotlinFileType;
+import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.test.ConfigurationKind;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestJdkKind;
 import org.jetbrains.kotlin.utils.Printer;
 import org.junit.Assert;
@@ -133,7 +133,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
     private class FilesWriter {
         private final boolean isFullJdk;
 
-        public List<JetFile> files = new ArrayList<JetFile>();
+        public List<KtFile> files = new ArrayList<KtFile>();
         private KotlinCoreEnvironment environment;
 
         private FilesWriter(boolean isFullJdk) {
@@ -143,12 +143,10 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
 
         private KotlinCoreEnvironment createEnvironment(boolean isFullJdk) {
             return isFullJdk ?
-                   JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
+                   KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
                            myTestRootDisposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK
                    ) :
-                   JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(
-                           myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS
-                   );
+                   KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable);
         }
 
         public boolean shouldWriteFilesOnDisk() {
@@ -163,11 +161,11 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
 
         public void writeFilesOnDisk() {
             writeFiles(files);
-            files = new ArrayList<JetFile>();
+            files = new ArrayList<KtFile>();
             environment = createEnvironment(isFullJdk);
         }
 
-        private void writeFiles(List<JetFile> filesToCompile) {
+        private void writeFiles(List<KtFile> filesToCompile) {
             System.out.println("Generating " + filesToCompile.size() + " files...");
             OutputFileCollection outputFiles;
             try {
@@ -184,7 +182,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
             }
             Assert.assertTrue("Cannot create directory for compiled files", outputDir.exists());
 
-            OutputUtilsPackage.writeAllTo(outputFiles, outputDir);
+            OutputUtilsKt.writeAllTo(outputFiles, outputDir);
         }
     }
 
@@ -209,7 +207,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
                     processFiles(printer, listFiles, holderFull, holderMock);
                 }
             }
-            else if (!FileUtilRt.getExtension(file.getName()).equals(JetFileType.INSTANCE.getDefaultExtension())) {
+            else if (!FileUtilRt.getExtension(file.getName()).equals(KotlinFileType.INSTANCE.getDefaultExtension())) {
                 // skip non kotlin files
             }
             else {

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java

@@ -21,24 +21,23 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage;
+import org.jetbrains.kotlin.backend.common.bridges.ImplKt;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
-import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilPackage;
-import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage;
+import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt;
+import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt;
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
-import org.jetbrains.kotlin.types.JetType;
+import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
+import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.kotlin.types.TypeUtils;
-import org.jetbrains.kotlin.types.checker.JetTypeChecker;
+import org.jetbrains.kotlin.types.checker.KotlinTypeChecker;
 
 import java.util.*;
 
-import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns;
-
 public class CodegenUtil {
 
     private CodegenUtil() {
@@ -51,9 +50,9 @@ public class CodegenUtil {
             @NotNull ClassifierDescriptor returnedClassifier,
             @NotNull ClassifierDescriptor... valueParameterClassifiers
     ) {
-        Collection<FunctionDescriptor> functions = owner.getDefaultType().getMemberScope().getFunctions(name, NoLookupLocation.FROM_BACKEND);
+        Collection<FunctionDescriptor> functions = owner.getDefaultType().getMemberScope().getContributedFunctions(name, NoLookupLocation.FROM_BACKEND);
         for (FunctionDescriptor function : functions) {
-            if (!CallResolverUtilPackage.isOrOverridesSynthesized(function)
+            if (!CallResolverUtilKt.isOrOverridesSynthesized(function)
                 && function.getTypeParameters().isEmpty()
                 && valueParameterClassesMatch(function.getValueParameters(), Arrays.asList(valueParameterClassifiers))
                 && rawTypeMatches(function.getReturnType(), returnedClassifier)) {
@@ -64,10 +63,10 @@ public class CodegenUtil {
     }
 
     @Nullable
-    public static PropertyDescriptor getDelegatePropertyIfAny(JetExpression expression, ClassDescriptor classDescriptor, BindingContext bindingContext) {
+    public static PropertyDescriptor getDelegatePropertyIfAny(KtExpression expression, ClassDescriptor classDescriptor, BindingContext bindingContext) {
         PropertyDescriptor propertyDescriptor = null;
-        if (expression instanceof JetSimpleNameExpression) {
-            ResolvedCall<?> call = CallUtilPackage.getResolvedCall(expression, bindingContext);
+        if (expression instanceof KtSimpleNameExpression) {
+            ResolvedCall<?> call = CallUtilKt.getResolvedCall(expression, bindingContext);
             if (call != null) {
                 CallableDescriptor callResultingDescriptor = call.getResultingDescriptor();
                 if (callResultingDescriptor instanceof ValueParameterDescriptor) {
@@ -96,11 +95,11 @@ public class CodegenUtil {
     @NotNull
     public static Map<FunctionDescriptor, FunctionDescriptor> getTraitMethods(ClassDescriptor descriptor) {
         Map<FunctionDescriptor, FunctionDescriptor> result = new LinkedHashMap<FunctionDescriptor, FunctionDescriptor>();
-        for (DeclarationDescriptor declaration : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
+        for (DeclarationDescriptor declaration : DescriptorUtils.getAllDescriptors(descriptor.getDefaultType().getMemberScope())) {
             if (!(declaration instanceof CallableMemberDescriptor)) continue;
 
             CallableMemberDescriptor inheritedMember = (CallableMemberDescriptor) declaration;
-            CallableMemberDescriptor traitMember = BridgesPackage.findTraitImplementation(inheritedMember);
+            CallableMemberDescriptor traitMember = ImplKt.findTraitImplementation(inheritedMember);
             if (traitMember == null) continue;
 
             assert traitMember.getModality() != Modality.ABSTRACT : "Cannot delegate to abstract trait method: " + inheritedMember;
@@ -141,8 +140,8 @@ public class CodegenUtil {
     }
 
     @NotNull
-    public static ClassDescriptor getSuperClassByDelegationSpecifier(@NotNull JetDelegationSpecifier specifier, @NotNull BindingContext bindingContext) {
-        JetType superType = bindingContext.get(BindingContext.TYPE, specifier.getTypeReference());
+    public static ClassDescriptor getSuperClassByDelegationSpecifier(@NotNull KtDelegationSpecifier specifier, @NotNull BindingContext bindingContext) {
+        KotlinType superType = bindingContext.get(BindingContext.TYPE, specifier.getTypeReference());
         assert superType != null : "superType should not be null: " + specifier.getText();
 
         ClassDescriptor superClassDescriptor = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor();
@@ -165,29 +164,27 @@ public class CodegenUtil {
         return true;
     }
 
-    private static boolean rawTypeMatches(JetType type, ClassifierDescriptor classifier) {
+    private static boolean rawTypeMatches(KotlinType type, ClassifierDescriptor classifier) {
         return type.getConstructor().equals(classifier.getTypeConstructor());
     }
 
     public static boolean isEnumValueOfMethod(@NotNull FunctionDescriptor functionDescriptor) {
         List<ValueParameterDescriptor> methodTypeParameters = functionDescriptor.getValueParameters();
-        JetType nullableString = TypeUtils.makeNullable(getBuiltIns(functionDescriptor).getStringType());
+        KotlinType nullableString = TypeUtils.makeNullable(DescriptorUtilsKt.getBuiltIns(functionDescriptor).getStringType());
         return DescriptorUtils.ENUM_VALUE_OF.equals(functionDescriptor.getName())
                && methodTypeParameters.size() == 1
-               && JetTypeChecker.DEFAULT.isSubtypeOf(methodTypeParameters.get(0).getType(), nullableString);
+               && KotlinTypeChecker.DEFAULT.isSubtypeOf(methodTypeParameters.get(0).getType(), nullableString);
     }
 
-    public static boolean isEnumValuesMethod(@NotNull FunctionDescriptor functionDescriptor) {
-        List<ValueParameterDescriptor> methodTypeParameters = functionDescriptor.getValueParameters();
-        return DescriptorUtils.ENUM_VALUES.equals(functionDescriptor.getName())
-               && methodTypeParameters.isEmpty();
+    public static boolean isEnumValuesProperty(@NotNull VariableDescriptor propertyDescriptor) {
+        return DescriptorUtils.ENUM_VALUES.equals(propertyDescriptor.getName());
     }
 
     @Nullable
     public static Integer getLineNumberForElement(@NotNull PsiElement statement, boolean markEndOffset) {
         PsiFile file = statement.getContainingFile();
-        if (file instanceof JetFile) {
-            if (PsiPackage.getDoNotAnalyze((JetFile) file) != null) {
+        if (file instanceof KtFile) {
+            if (KtPsiFactoryKt.getDoNotAnalyze((KtFile) file) != null) {
                 return null;
             }
         }

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt

@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.MemberComparator
-import org.jetbrains.kotlin.types.JetType
+import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.isDynamic
 import org.jetbrains.kotlin.utils.keysToMapExceptNulls
 import java.util.Comparator
@@ -38,15 +38,15 @@ public object CodegenUtilKt {
     public fun getDelegates(
             descriptor: ClassDescriptor,
             toTrait: ClassDescriptor,
-            delegateExpressionType: JetType? = null
+            delegateExpressionType: KotlinType? = null
     ): Map<CallableMemberDescriptor, CallableDescriptor> {
         if (delegateExpressionType?.isDynamic() ?: false) return mapOf();
 
-        return descriptor.getDefaultType().getMemberScope().getDescriptors().asSequence()
+        return descriptor.getDefaultType().getMemberScope().getContributedDescriptors().asSequence()
             .filterIsInstance<CallableMemberDescriptor>()
             .filter { it.getKind() == CallableMemberDescriptor.Kind.DELEGATION }
-            .toList()
-            .sortBy(MemberComparator.INSTANCE as Comparator<CallableMemberDescriptor>) // Workaround for KT-6030
+            .asIterable()
+            .sortedWith(MemberComparator.INSTANCE)
             .keysToMapExceptNulls {
                 delegatingMember ->
 
@@ -58,7 +58,7 @@ public object CodegenUtilKt {
                             val name = overriddenDescriptor.getName()
 
                             // this is the actual member of delegateExpressionType that we are delegating to
-                            (scope.getFunctions(name, NoLookupLocation.FROM_BACKEND) + scope.getProperties(name, NoLookupLocation.FROM_BACKEND))
+                            (scope.getContributedFunctions(name, NoLookupLocation.FROM_BACKEND) + scope.getContributedVariables(name, NoLookupLocation.FROM_BACKEND))
                                     .first {
                                         (listOf(it) + DescriptorUtils.getAllOverriddenDescriptors(it)).map { it.getOriginal() }.contains(overriddenDescriptor.getOriginal())
                                     }

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java

@@ -22,34 +22,33 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.psi.JetClass;
-import org.jetbrains.kotlin.psi.JetClassOrObject;
-import org.jetbrains.kotlin.psi.JetParameter;
+import org.jetbrains.kotlin.psi.KtClass;
+import org.jetbrains.kotlin.psi.KtClassOrObject;
+import org.jetbrains.kotlin.psi.KtParameter;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.BindingContextUtils;
 import org.jetbrains.kotlin.resolve.OverrideResolver;
+import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns;
-
 /**
  * A platform-independent logic for generating data class synthetic methods.
  * TODO: data class with zero components gets no toString/equals/hashCode methods. This is inconsistent and should be
  *       changed here with the platform backends adopted.
  */
 public abstract class DataClassMethodGenerator {
-    private final JetClassOrObject declaration;
+    private final KtClassOrObject declaration;
     private final BindingContext bindingContext;
     private final ClassDescriptor classDescriptor;
     private final KotlinBuiltIns builtIns;
 
-    public DataClassMethodGenerator(JetClassOrObject declaration, BindingContext bindingContext) {
+    public DataClassMethodGenerator(KtClassOrObject declaration, BindingContext bindingContext) {
         this.declaration = declaration;
         this.bindingContext = bindingContext;
         this.classDescriptor = BindingContextUtils.getNotNull(bindingContext, BindingContext.CLASS, declaration);
-        this.builtIns = getBuiltIns(classDescriptor);
+        this.builtIns = DescriptorUtilsKt.getBuiltIns(classDescriptor);
     }
 
     public void generate() {
@@ -67,7 +66,7 @@ public abstract class DataClassMethodGenerator {
 
     protected abstract void generateComponentFunction(@NotNull FunctionDescriptor function, @NotNull ValueParameterDescriptor parameter);
 
-    protected abstract void generateCopyFunction(@NotNull FunctionDescriptor function, @NotNull List<JetParameter> constructorParameters);
+    protected abstract void generateCopyFunction(@NotNull FunctionDescriptor function, @NotNull List<KtParameter> constructorParameters);
 
     protected abstract void generateToStringMethod(@NotNull FunctionDescriptor function, @NotNull List<PropertyDescriptor> properties);
 
@@ -94,7 +93,7 @@ public abstract class DataClassMethodGenerator {
         }
     }
 
-    private void generateCopyFunctionForDataClasses(List<JetParameter> constructorParameters) {
+    private void generateCopyFunctionForDataClasses(List<KtParameter> constructorParameters) {
         FunctionDescriptor copyFunction = bindingContext.get(BindingContext.DATA_CLASS_COPY_FUNCTION, classDescriptor);
         if (copyFunction != null) {
             generateCopyFunction(copyFunction, constructorParameters);
@@ -124,7 +123,7 @@ public abstract class DataClassMethodGenerator {
 
     private List<PropertyDescriptor> getDataProperties() {
         List<PropertyDescriptor> result = Lists.newArrayList();
-        for (JetParameter parameter : getPrimaryConstructorParameters()) {
+        for (KtParameter parameter : getPrimaryConstructorParameters()) {
             if (parameter.hasValOrVar()) {
                 result.add(bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, parameter));
             }
@@ -133,8 +132,8 @@ public abstract class DataClassMethodGenerator {
     }
 
     @NotNull
-    private List<JetParameter> getPrimaryConstructorParameters() {
-        if (declaration instanceof JetClass) {
+    private List<KtParameter> getPrimaryConstructorParameters() {
+        if (declaration instanceof KtClass) {
             return declaration.getPrimaryConstructorParameters();
         }
         return Collections.emptyList();

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt

@@ -69,7 +69,7 @@ public fun <Function : FunctionHandle, Signature> generateBridges(
     return bridgesToGenerate.map { Bridge(it, method) }.toSet()
 }
 
-private fun <Function : FunctionHandle> findAllReachableDeclarations(function: Function): MutableSet<Function> {
+public fun <Function : FunctionHandle> findAllReachableDeclarations(function: Function): MutableSet<Function> {
     val collector = object : DFS.NodeHandlerWithListResult<Function, Function>() {
         override fun afterChildren(current: Function) {
             if (current.isDeclaration) {
@@ -86,7 +86,7 @@ private fun <Function : FunctionHandle> findAllReachableDeclarations(function: F
  * Given a concrete function, finds an implementation (a concrete declaration) of this function in the supertypes.
  * The implementation is guaranteed to exist because if it wouldn't, the given function would've been abstract
  */
-private fun <Function : FunctionHandle> findConcreteSuperDeclaration(function: Function): Function {
+public fun <Function : FunctionHandle> findConcreteSuperDeclaration(function: Function): Function {
     require(!function.isAbstract, { "Only concrete functions have implementations: $function" })
 
     if (function.isDeclaration) return function

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt

@@ -47,7 +47,7 @@ public fun <Signature> generateBridgesForFunctionDescriptor(
  * can generate a bridge near an implementation (of course, in case it has a super-declaration with a different signature). Ultimately this
  * eases the process of determining what bridges are already generated in our supertypes and need to be inherited, not regenerated.
  */
-private data class DescriptorBasedFunctionHandle(val descriptor: FunctionDescriptor) : FunctionHandle {
+public data class DescriptorBasedFunctionHandle(val descriptor: FunctionDescriptor) : FunctionHandle {
     private val overridden = descriptor.getOverriddenDescriptors().map { DescriptorBasedFunctionHandle(it.getOriginal()) }
 
     override val isDeclaration: Boolean =
@@ -56,7 +56,7 @@ private data class DescriptorBasedFunctionHandle(val descriptor: FunctionDescrip
 
     override val isAbstract: Boolean =
             descriptor.getModality() == Modality.ABSTRACT ||
-            DescriptorUtils.isTrait(descriptor.getContainingDeclaration())
+            DescriptorUtils.isInterface(descriptor.getContainingDeclaration())
 
     override fun getOverridden() = overridden
 }
@@ -74,7 +74,7 @@ public fun findTraitImplementation(descriptor: CallableMemberDescriptor): Callab
     val implementation = findImplementationFromInterface(descriptor) ?: return null
     val immediateConcreteSuper = firstSuperMethodFromKotlin(descriptor, implementation) ?: return null
 
-    if (!DescriptorUtils.isTrait(immediateConcreteSuper.getContainingDeclaration())) {
+    if (!DescriptorUtils.isInterface(immediateConcreteSuper.getContainingDeclaration())) {
         // If this implementation is already generated into the superclass, we need not generate it again, it'll be inherited
         return null
     }

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt

@@ -33,8 +33,6 @@ public interface OutputFile {
     public val sourceFiles: List<File>
     public fun asByteArray(): ByteArray
     public fun asText(): String
-
-    override fun toString() = "$relativePath (compiled from $sourceFiles)"
 }
 
 public class SimpleOutputFile(
@@ -44,4 +42,6 @@ public class SimpleOutputFile(
 ) : OutputFile {
     override fun asByteArray(): ByteArray = content.toByteArray()
     override fun asText(): String = content
+
+    override fun toString() = "$relativePath (compiled from $sourceFiles)"
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java

@@ -22,6 +22,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.inline.FileMapping;
 import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil;
 import org.jetbrains.kotlin.codegen.inline.SMAPBuilder;
+import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
 import org.jetbrains.org.objectweb.asm.*;
 

compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java

@@ -19,12 +19,12 @@ package org.jetbrains.kotlin.codegen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
-import org.jetbrains.kotlin.psi.JetSuperExpression;
+import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 
 public interface AccessorForCallableDescriptor<T extends CallableMemberDescriptor> {
     @NotNull
     T getCalleeDescriptor();
 
     @Nullable
-    JetSuperExpression getSuperCallExpression();
+    ClassDescriptor getSuperCallTarget();
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt

@@ -18,14 +18,13 @@ package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.JetSuperExpression
 import org.jetbrains.kotlin.resolve.DescriptorUtils
-import org.jetbrains.kotlin.types.JetType
+import org.jetbrains.kotlin.types.KotlinType
 
 public class AccessorForConstructorDescriptor(
         private val calleeDescriptor: ConstructorDescriptor,
         containingDeclaration: DeclarationDescriptor,
-        private val superCallExpression: JetSuperExpression?
+        private val superCallTarget: ClassDescriptor?
 ) : AbstractAccessorForFunctionDescriptor(containingDeclaration, Name.special("<init>")),
         ConstructorDescriptor,
         AccessorForCallableDescriptor<ConstructorDescriptor> {
@@ -35,9 +34,9 @@ public class AccessorForConstructorDescriptor(
 
     override fun isPrimary(): Boolean = false
 
-    override fun getReturnType(): JetType = super.getReturnType()!!
+    override fun getReturnType(): KotlinType = super.getReturnType()!!
 
-    override fun getSuperCallExpression(): JetSuperExpression? = superCallExpression
+    override fun getSuperCallTarget(): ClassDescriptor? = superCallTarget
 
     init {
         initialize(
@@ -47,7 +46,7 @@ public class AccessorForConstructorDescriptor(
                 copyValueParameters(calleeDescriptor),
                 calleeDescriptor.returnType,
                 Modality.FINAL,
-                Visibilities.INTERNAL
+                Visibilities.LOCAL
         )
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java

@@ -20,34 +20,33 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.psi.JetSuperExpression;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
-import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage;
+import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt;
 
 public class AccessorForFunctionDescriptor extends AbstractAccessorForFunctionDescriptor implements AccessorForCallableDescriptor<FunctionDescriptor> {
     private final FunctionDescriptor calleeDescriptor;
-    private final JetSuperExpression superCallExpression;
+    private final ClassDescriptor superCallTarget;
 
     public AccessorForFunctionDescriptor(
             @NotNull FunctionDescriptor descriptor,
             @NotNull DeclarationDescriptor containingDeclaration,
-            int index,
-            @Nullable JetSuperExpression superCallExpression
+            @Nullable ClassDescriptor superCallTarget,
+            @NotNull String nameSuffix
     ) {
         super(containingDeclaration,
-              Name.identifier("access$" + (descriptor instanceof ConstructorDescriptor ? "init" : descriptor.getName()) + "$" + index));
+              Name.identifier("access$" + nameSuffix));
         this.calleeDescriptor = descriptor;
-        this.superCallExpression = superCallExpression;
+        this.superCallTarget = superCallTarget;
 
         initialize(DescriptorUtils.getReceiverParameterType(descriptor.getExtensionReceiverParameter()),
-                   descriptor instanceof ConstructorDescriptor || AnnotationsPackage.isPlatformStaticInObjectOrClass(descriptor)
+                   descriptor instanceof ConstructorDescriptor || AnnotationUtilKt.isPlatformStaticInObjectOrClass(descriptor)
                         ? null
                         : descriptor.getDispatchReceiverParameter(),
                    copyTypeParameters(descriptor),
                    copyValueParameters(descriptor),
                    descriptor.getReturnType(),
                    Modality.FINAL,
-                   Visibilities.INTERNAL);
+                   Visibilities.LOCAL);
     }
 
     @NotNull
@@ -57,7 +56,7 @@ public class AccessorForFunctionDescriptor extends AbstractAccessorForFunctionDe
     }
 
     @Override
-    public JetSuperExpression getSuperCallExpression() {
-        return superCallExpression;
+    public ClassDescriptor getSuperCallTarget() {
+        return superCallTarget;
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingField.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
+import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
+import org.jetbrains.kotlin.psi.KtSuperExpression
+import org.jetbrains.kotlin.types.KotlinType
+
+abstract class AccessorForPropertyBackingField(property: PropertyDescriptor,
+                                               type: KotlinType,
+                                               receiverType: KotlinType?,
+                                               dispatchReceiver: ReceiverParameterDescriptor?,
+                                               containingDeclaration: DeclarationDescriptor,
+                                               suffix: String
+) : AccessorForPropertyDescriptor(property, type, receiverType, dispatchReceiver, containingDeclaration, null, suffix)

compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldFromLocal.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
+import org.jetbrains.kotlin.resolve.DescriptorUtils
+
+class AccessorForPropertyBackingFieldFromLocal(property: PropertyDescriptor,
+                                               containingDeclaration: DeclarationDescriptor,
+                                               nameSuffix: String
+) : AccessorForPropertyBackingField(property, property.type,
+                                    DescriptorUtils.getReceiverParameterType(property.extensionReceiverParameter),
+                                    property.dispatchReceiverParameter, containingDeclaration, nameSuffix)

compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInClassCompanion.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
+import org.jetbrains.kotlin.types.KotlinType
+
+class AccessorForPropertyBackingFieldInClassCompanion(property: PropertyDescriptor,
+                                                      containingDeclaration: DeclarationDescriptor,
+                                                      delegationType: KotlinType?,
+                                                      nameSuffix: String
+) : AccessorForPropertyBackingField(property, delegationType ?: property.type, null, null, containingDeclaration, nameSuffix)

compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java

@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.codegen;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
-import org.jetbrains.kotlin.descriptors.PropertyDescriptor;
-import org.jetbrains.kotlin.types.JetType;
-
-public class AccessorForPropertyBackingFieldInOuterClass extends AccessorForPropertyDescriptor {
-    public AccessorForPropertyBackingFieldInOuterClass(
-            @NotNull PropertyDescriptor property,
-            @NotNull DeclarationDescriptor containingDeclaration,
-            int index,
-            @Nullable JetType delegationType
-    ) {
-        super(property, delegationType != null ? delegationType : property.getType(), null, null, containingDeclaration, index, null);
-    }
-}

compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java

@@ -25,51 +25,79 @@ import org.jetbrains.kotlin.descriptors.impl.PropertyGetterDescriptorImpl;
 import org.jetbrains.kotlin.descriptors.impl.PropertySetterDescriptorImpl;
 import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl;
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.psi.JetSuperExpression;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
-import org.jetbrains.kotlin.types.JetType;
+import org.jetbrains.kotlin.types.KotlinType;
 
 import java.util.Collections;
 
 public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implements AccessorForCallableDescriptor<PropertyDescriptor> {
     private final PropertyDescriptor calleeDescriptor;
-    private final int accessorIndex;
-    private final JetSuperExpression superCallExpression;
+    private final ClassDescriptor superCallTarget;
+    @NotNull private final String nameSuffix;
+    private final boolean withSyntheticGetterAccessor;
+    private final boolean withSyntheticSetterAccessor;
 
     public AccessorForPropertyDescriptor(
             @NotNull PropertyDescriptor property,
             @NotNull DeclarationDescriptor containingDeclaration,
-            int index,
-            @Nullable JetSuperExpression superCallExpression
+            @Nullable ClassDescriptor superCallTarget,
+            @NotNull String nameSuffix,
+            boolean getterAccessorRequired,
+            boolean setterAccessorRequired
     ) {
         this(property, property.getType(), DescriptorUtils.getReceiverParameterType(property.getExtensionReceiverParameter()),
-             property.getDispatchReceiverParameter(), containingDeclaration, index, superCallExpression);
+             property.getDispatchReceiverParameter(), containingDeclaration, superCallTarget, nameSuffix,
+             getterAccessorRequired, setterAccessorRequired);
     }
 
     protected AccessorForPropertyDescriptor(
             @NotNull PropertyDescriptor original,
-            @NotNull JetType propertyType,
-            @Nullable JetType receiverType,
+            @NotNull KotlinType propertyType,
+            @Nullable KotlinType receiverType,
             @Nullable ReceiverParameterDescriptor dispatchReceiverParameter,
             @NotNull DeclarationDescriptor containingDeclaration,
-            int index,
-            @Nullable JetSuperExpression superCallExpression
+            @Nullable ClassDescriptor superCallTarget,
+            @NotNull String nameSuffix
     ) {
-        super(containingDeclaration, null, Annotations.EMPTY, Modality.FINAL, Visibilities.LOCAL,
-              original.isVar(), Name.identifier("access$" + getIndexedAccessorSuffix(original, index)),
-              Kind.DECLARATION, SourceElement.NO_SOURCE, false);
+        this(original, propertyType, receiverType, dispatchReceiverParameter, containingDeclaration, superCallTarget, nameSuffix, true, true);
+    }
+
+    protected AccessorForPropertyDescriptor(
+            @NotNull PropertyDescriptor original,
+            @NotNull KotlinType propertyType,
+            @Nullable KotlinType receiverType,
+            @Nullable ReceiverParameterDescriptor dispatchReceiverParameter,
+            @NotNull DeclarationDescriptor containingDeclaration,
+            @Nullable ClassDescriptor superCallTarget,
+            @NotNull String nameSuffix,
+            boolean getterAccessorRequired,
+            boolean setterAccessorRequired
+    ) {
+        super(containingDeclaration, null, Annotations.Companion.getEMPTY(), Modality.FINAL, Visibilities.LOCAL,
+              original.isVar(), Name.identifier("access$" + nameSuffix),
+              Kind.DECLARATION, SourceElement.NO_SOURCE, /* lateInit = */ false, /* isConst = */ false);
 
         this.calleeDescriptor = original;
-        this.accessorIndex = index;
-        this.superCallExpression = superCallExpression;
+        this.superCallTarget = superCallTarget;
+        this.nameSuffix = nameSuffix;
         setType(propertyType, Collections.<TypeParameterDescriptorImpl>emptyList(), dispatchReceiverParameter, receiverType);
-        initialize(new Getter(this), new Setter(this));
+
+        this.withSyntheticGetterAccessor = getterAccessorRequired;
+        this.withSyntheticSetterAccessor = setterAccessorRequired;
+
+        PropertyGetterDescriptorImpl getterDescriptor =
+                getterAccessorRequired ? new Getter(this) : (PropertyGetterDescriptorImpl) original.getGetter();
+        PropertySetterDescriptor setterDescriptor =
+                setterAccessorRequired ? new Setter(this) : original.getSetter();
+        initialize(getterDescriptor, setterDescriptor);
     }
 
     public static class Getter extends PropertyGetterDescriptorImpl implements AccessorForCallableDescriptor<PropertyGetterDescriptor> {
         public Getter(AccessorForPropertyDescriptor property) {
-            super(property, Annotations.EMPTY, Modality.FINAL, Visibilities.LOCAL,
-                  false, false, Kind.DECLARATION, null, SourceElement.NO_SOURCE);
+            super(property, Annotations.Companion.getEMPTY(), Modality.FINAL, Visibilities.LOCAL,
+                  false, false,
+                  /* isExternal = */ false,
+                  Kind.DECLARATION, null, SourceElement.NO_SOURCE);
             initialize(property.getType());
         }
 
@@ -80,17 +108,20 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implem
             return ((AccessorForPropertyDescriptor) getCorrespondingProperty()).getCalleeDescriptor().getGetter();
         }
 
-        @Nullable
         @Override
-        public JetSuperExpression getSuperCallExpression() {
-            return ((AccessorForPropertyDescriptor) getCorrespondingProperty()).getSuperCallExpression();
+        @Nullable
+        public ClassDescriptor getSuperCallTarget() {
+            return ((AccessorForPropertyDescriptor) getCorrespondingProperty()).getSuperCallTarget();
         }
+
     }
 
     public static class Setter extends PropertySetterDescriptorImpl implements AccessorForCallableDescriptor<PropertySetterDescriptor>{
         public Setter(AccessorForPropertyDescriptor property) {
-            super(property, Annotations.EMPTY, Modality.FINAL, Visibilities.LOCAL,
-                  false, false, Kind.DECLARATION, null, SourceElement.NO_SOURCE);
+            super(property, Annotations.Companion.getEMPTY(), Modality.FINAL, Visibilities.LOCAL,
+                  false, false,
+                  /* isExternal = */ false,
+                  Kind.DECLARATION, null, SourceElement.NO_SOURCE);
             initializeDefault();
         }
 
@@ -101,10 +132,10 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implem
             return ((AccessorForPropertyDescriptor) getCorrespondingProperty()).getCalleeDescriptor().getSetter();
         }
 
-        @Nullable
         @Override
-        public JetSuperExpression getSuperCallExpression() {
-            return ((AccessorForPropertyDescriptor) getCorrespondingProperty()).getSuperCallExpression();
+        @Nullable
+        public ClassDescriptor getSuperCallTarget() {
+            return ((AccessorForPropertyDescriptor) getCorrespondingProperty()).getSuperCallTarget();
         }
     }
 
@@ -115,17 +146,20 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl implem
     }
 
     @Override
-    public JetSuperExpression getSuperCallExpression() {
-        return superCallExpression;
+    public ClassDescriptor getSuperCallTarget() {
+        return superCallTarget;
     }
 
     @NotNull
-    public String getIndexedAccessorSuffix() {
-        return getIndexedAccessorSuffix(calleeDescriptor, accessorIndex);
+    public String getAccessorSuffix() {
+        return nameSuffix;
     }
 
-    @NotNull
-    private static String getIndexedAccessorSuffix(@NotNull PropertyDescriptor original, int index) {
-        return original.getName() + "$" + index;
+    public boolean isWithSyntheticGetterAccessor() {
+        return withSyntheticGetterAccessor;
+    }
+
+    public boolean isWithSyntheticSetterAccessor() {
+        return withSyntheticSetterAccessor;
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java

@@ -22,23 +22,19 @@ import org.jetbrains.kotlin.codegen.annotation.WrappedAnnotated;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.annotations.*;
+import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor;
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.resolve.AnnotationChecker;
 import org.jetbrains.kotlin.resolve.constants.*;
 import org.jetbrains.kotlin.resolve.constants.StringValue;
-import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage;
-import org.jetbrains.kotlin.types.Flexibility;
-import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.kotlin.types.TypeUtils;
-import org.jetbrains.kotlin.types.TypesPackage;
+import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
+import org.jetbrains.kotlin.types.*;
 import org.jetbrains.org.objectweb.asm.*;
 
 import java.lang.annotation.*;
 import java.util.*;
 
-import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getClassObjectType;
-
 public abstract class AnnotationCodegen {
 
     public static final class JvmFlagAnnotation {
@@ -66,9 +62,7 @@ public abstract class AnnotationCodegen {
 
     public static final List<JvmFlagAnnotation> METHOD_FLAGS = Arrays.asList(
             new JvmFlagAnnotation("kotlin.jvm.Strictfp", Opcodes.ACC_STRICT),
-            new JvmFlagAnnotation("kotlin.jvm.Synchronized", Opcodes.ACC_SYNCHRONIZED),
-            new JvmFlagAnnotation("kotlin.jvm.native", Opcodes.ACC_NATIVE),
-            new JvmFlagAnnotation("kotlin.external", Opcodes.ACC_NATIVE)
+            new JvmFlagAnnotation("kotlin.jvm.Synchronized", Opcodes.ACC_SYNCHRONIZED)
     );
 
     private static final AnnotationVisitor NO_ANNOTATION_VISITOR = new AnnotationVisitor(Opcodes.ASM5) {};
@@ -105,6 +99,16 @@ public abstract class AnnotationCodegen {
             // Skip if the target is not the same
             if (allowedTarget != null && annotationTarget != null && allowedTarget != annotationTarget) continue;
 
+            Set<KotlinTarget> applicableTargets = AnnotationChecker.applicableTargetSet(annotation);
+            if (annotated instanceof AnonymousFunctionDescriptor
+                && !applicableTargets.contains(KotlinTarget.FUNCTION)
+                && !applicableTargets.contains(KotlinTarget.PROPERTY_GETTER)
+                && !applicableTargets.contains(KotlinTarget.PROPERTY_SETTER)) {
+                assert (applicableTargets.contains(KotlinTarget.EXPRESSION)) :
+                        "Inconsistent target list for lambda annotation: " + applicableTargets + " on " + annotated;
+                continue;
+            }
+
             String descriptor = genAnnotation(annotation);
             if (descriptor != null) {
                 annotationDescriptorsAlreadyPresent.add(descriptor);
@@ -153,7 +157,7 @@ public abstract class AnnotationCodegen {
         return false;
     }
 
-    private void generateNullabilityAnnotation(@Nullable JetType type, @NotNull Set<String> annotationDescriptorsAlreadyPresent) {
+    private void generateNullabilityAnnotation(@Nullable KotlinType type, @NotNull Set<String> annotationDescriptorsAlreadyPresent) {
         if (type == null) return;
 
         if (isBareTypeParameterWithNullableUpperBound(type)) {
@@ -164,9 +168,9 @@ public abstract class AnnotationCodegen {
             return;
         }
 
-        if (TypesPackage.isFlexible(type)) {
+        if (FlexibleTypesKt.isFlexible(type)) {
             // A flexible type whose lower bound in not-null and upper bound is nullable, should not be annotated
-            Flexibility flexibility = TypesPackage.flexibility(type);
+            Flexibility flexibility = FlexibleTypesKt.flexibility(type);
 
             if (!TypeUtils.isNullableType(flexibility.getLowerBound()) && TypeUtils.isNullableType(flexibility.getUpperBound())) {
                 AnnotationDescriptor notNull = type.getAnnotations().findAnnotation(JvmAnnotationNames.JETBRAINS_NOT_NULL_ANNOTATION);
@@ -234,7 +238,7 @@ public abstract class AnnotationCodegen {
     }
 
     private void generateDocumentedAnnotation(@NotNull ClassDescriptor classDescriptor, @NotNull Set<String> annotationDescriptorsAlreadyPresent) {
-        boolean documented = DescriptorUtilPackage.isDocumentedAnnotation(classDescriptor);
+        boolean documented = DescriptorUtilsKt.isDocumentedAnnotation(classDescriptor);
         if (!documented) return;
         String descriptor = Type.getType(Documented.class).getDescriptor();
         if (!annotationDescriptorsAlreadyPresent.add(descriptor)) return;
@@ -249,12 +253,12 @@ public abstract class AnnotationCodegen {
         }
     }
 
-    private static boolean isBareTypeParameterWithNullableUpperBound(@NotNull JetType type) {
+    private static boolean isBareTypeParameterWithNullableUpperBound(@NotNull KotlinType type) {
         ClassifierDescriptor classifier = type.getConstructor().getDeclarationDescriptor();
         return !type.isMarkedNullable() && classifier instanceof TypeParameterDescriptor && TypeUtils.hasNullableSuperType(type);
     }
 
-    public void generateAnnotationDefaultValue(@NotNull ConstantValue<?> value, @NotNull JetType expectedType) {
+    public void generateAnnotationDefaultValue(@NotNull ConstantValue<?> value, @NotNull KotlinType expectedType) {
         AnnotationVisitor visitor = visitAnnotation(null, false);  // Parameters are unimportant
         genCompileTimeValue(null, value, visitor);
         visitor.visitEnd();
@@ -385,7 +389,15 @@ public abstract class AnnotationCodegen {
             }
 
             private Void visitUnsupportedValue(ConstantValue<?> value) {
-                throw new IllegalStateException("Don't know how to compile annotation value " + value);
+                ClassBuilderMode mode = typeMapper.getClassBuilderMode();
+                switch (mode) {
+                    case FULL:
+                        throw new IllegalStateException("Don't know how to compile annotation value " + value);
+                    case LIGHT_CLASSES:
+                        return null;
+                    default:
+                        throw new IllegalStateException("Unknown builder mode: " + mode);
+                }
             }
         };
 
@@ -414,7 +426,7 @@ public abstract class AnnotationCodegen {
                     for (ConstantValue<?> value : values) {
                         if (value instanceof EnumValue) {
                             ClassDescriptor enumEntry = ((EnumValue) value).getValue();
-                            JetType classObjectType = getClassObjectType(enumEntry);
+                            KotlinType classObjectType = DescriptorUtilsKt.getClassObjectType(enumEntry);
                             if (classObjectType != null) {
                                 if ("java/lang/annotation/ElementType".equals(typeMapper.mapType(classObjectType).getInternalName())) {
                                     result.add(ElementType.valueOf(enumEntry.getName().asString()));
@@ -431,7 +443,7 @@ public abstract class AnnotationCodegen {
 
     @NotNull
     private RetentionPolicy getRetentionPolicy(@NotNull Annotated descriptor) {
-        KotlinRetention retention = DescriptorUtilPackage.getAnnotationRetention(descriptor);
+        KotlinRetention retention = DescriptorUtilsKt.getAnnotationRetention(descriptor);
         if (retention != null) {
             return annotationRetentionMap.get(retention);
         }
@@ -442,7 +454,7 @@ public abstract class AnnotationCodegen {
                 ConstantValue<?> compileTimeConstant = valueArguments.iterator().next();
                 if (compileTimeConstant instanceof EnumValue) {
                     ClassDescriptor enumEntry = ((EnumValue) compileTimeConstant).getValue();
-                    JetType classObjectType = getClassObjectType(enumEntry);
+                    KotlinType classObjectType = DescriptorUtilsKt.getClassObjectType(enumEntry);
                     if (classObjectType != null) {
                         if ("java/lang/annotation/RetentionPolicy".equals(typeMapper.mapType(classObjectType).getInternalName())) {
                             return RetentionPolicy.valueOf(enumEntry.getName().asString());

compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.java

@@ -1,86 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.codegen;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument;
-import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument;
-import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument;
-import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public abstract class ArgumentGenerator {
-    /**
-     * @return a {@code List} of bit masks of default arguments that should be passed as last arguments to $default method, if there were
-     * any default arguments, or an empty {@code List} if there were none
-     * @see kotlin.reflect.jvm.internal.KCallableImpl#callBy(Map...)
-     */
-    @NotNull
-    public List<Integer> generate(@NotNull List<ResolvedValueArgument> valueArguments) {
-        List<Integer> masks = new ArrayList<Integer>(1);
-        int mask = 0;
-        int n = valueArguments.size();
-        for (int i = 0; i < n; i++) {
-            if (i != 0 && i % Integer.SIZE == 0) {
-                masks.add(mask);
-                mask = 0;
-            }
-            ResolvedValueArgument argument = valueArguments.get(i);
-            if (argument instanceof ExpressionValueArgument) {
-                generateExpression(i, (ExpressionValueArgument) argument);
-            }
-            else if (argument instanceof DefaultValueArgument) {
-                mask |= 1 << (i % Integer.SIZE);
-                generateDefault(i, (DefaultValueArgument) argument);
-            }
-            else if (argument instanceof VarargValueArgument) {
-                generateVararg(i, (VarargValueArgument) argument);
-            }
-            else {
-                generateOther(i, argument);
-            }
-        }
-
-        if (mask == 0 && masks.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        masks.add(mask);
-        return masks;
-    }
-
-    protected void generateExpression(int i, @NotNull ExpressionValueArgument argument) {
-        throw new UnsupportedOperationException("Unsupported expression value argument #" + i + ": " + argument);
-    }
-
-    protected void generateDefault(int i, @NotNull DefaultValueArgument argument) {
-        throw new UnsupportedOperationException("Unsupported default value argument #" + i + ": " + argument);
-    }
-
-    protected void generateVararg(int i, @NotNull VarargValueArgument argument) {
-        throw new UnsupportedOperationException("Unsupported vararg value argument #" + i + ": " + argument);
-    }
-
-    @SuppressWarnings("MethodMayBeStatic") // is supposed to be overridden
-    protected void generateOther(int i, @NotNull ResolvedValueArgument argument) {
-        throw new UnsupportedOperationException("Unsupported value argument #" + i + ": " + argument);
-    }
-}

compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.kt

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument
+import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument
+import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument
+import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument
+import org.jetbrains.kotlin.utils.mapToIndex
+
+class ArgumentAndDeclIndex(val arg: ResolvedValueArgument, val declIndex: Int)
+
+abstract class ArgumentGenerator {
+    /**
+     * @return a `List` of bit masks of default arguments that should be passed as last arguments to $default method, if there were
+     * any default arguments, or an empty `List` if there were none
+     *
+     * @see kotlin.reflect.jvm.internal.KCallableImpl.callBy
+     */
+    open fun generate(valueArgumentsByIndex: List<ResolvedValueArgument>, actualArgs: List<ResolvedValueArgument>): DefaultCallMask {
+        assert(valueArgumentsByIndex.size() == actualArgs.size()) {
+            "Value arguments collection should have same size, but ${valueArgumentsByIndex.size()} != ${actualArgs.size()}"
+        }
+
+        val arg2Index = valueArgumentsByIndex.mapToIndex()
+
+        val actualArgsWithDeclIndex = actualArgs.filter { it !is DefaultValueArgument }.map {
+            ArgumentAndDeclIndex(it, arg2Index[it]!!)
+        }.toArrayList()
+
+        valueArgumentsByIndex.withIndex().forEach {
+            if (it.value is DefaultValueArgument) {
+                actualArgsWithDeclIndex.add(it.index, ArgumentAndDeclIndex(it.value, it.index))
+            }
+        }
+
+        val masks = DefaultCallMask(valueArgumentsByIndex.size())
+
+        for (argumentWithDeclIndex in actualArgsWithDeclIndex) {
+            val argument = argumentWithDeclIndex.arg
+            val declIndex = argumentWithDeclIndex.declIndex
+
+            when (argument) {
+                is ExpressionValueArgument -> {
+                    generateExpression(declIndex, argument)
+                }
+                is DefaultValueArgument -> {
+                    masks.mark(declIndex)
+                    generateDefault(declIndex, argument)
+                }
+                is VarargValueArgument -> {
+                    generateVararg(declIndex, argument)
+                }
+                else -> {
+                    generateOther(declIndex, argument)
+                }
+            }
+        }
+
+        reorderArgumentsIfNeeded(actualArgsWithDeclIndex)
+
+        return masks
+    }
+
+    protected open fun generateExpression(i: Int, argument: ExpressionValueArgument) {
+        throw UnsupportedOperationException("Unsupported expression value argument #$i: $argument")
+    }
+
+    protected open fun generateDefault(i: Int, argument: DefaultValueArgument) {
+        throw UnsupportedOperationException("Unsupported default value argument #$i: $argument")
+    }
+
+    protected open fun generateVararg(i: Int, argument: VarargValueArgument) {
+        throw UnsupportedOperationException("Unsupported vararg value argument #$i: $argument")
+    }
+
+    protected open fun generateOther(i: Int, argument: ResolvedValueArgument) {
+        throw UnsupportedOperationException("Unsupported value argument #$i: $argument")
+    }
+
+    protected open fun reorderArgumentsIfNeeded(args: List<ArgumentAndDeclIndex>) {
+        throw UnsupportedOperationException("Unsupported operation")
+    }
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java

@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
+import com.google.protobuf.MessageLite;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.tree.IElementType;
 import kotlin.Unit;
@@ -29,26 +30,29 @@ import org.jetbrains.kotlin.builtins.PrimitiveType;
 import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
 import org.jetbrains.kotlin.codegen.context.CodegenContext;
 import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods;
+import org.jetbrains.kotlin.codegen.serialization.JvmStringTable;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.jvm.RuntimeAssertionInfo;
-import org.jetbrains.kotlin.lexer.JetTokens;
+import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.load.java.JavaVisibilities;
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
 import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor;
 import org.jetbrains.kotlin.name.FqName;
+import org.jetbrains.kotlin.resolve.DeprecationUtilKt;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
-import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage;
-import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage;
+import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt;
 import org.jetbrains.kotlin.resolve.inline.InlineUtil;
+import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverKt;
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName;
-import org.jetbrains.kotlin.resolve.jvm.JvmPackage;
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
+import org.jetbrains.kotlin.serialization.DescriptorSerializer;
+import org.jetbrains.kotlin.serialization.jvm.BitEncoding;
 import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor;
-import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.kotlin.types.TypesPackage;
+import org.jetbrains.kotlin.types.FlexibleTypesKt;
+import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.org.objectweb.asm.*;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 import org.jetbrains.org.objectweb.asm.commons.Method;
@@ -60,10 +64,11 @@ import java.util.Set;
 
 import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.isBoolean;
 import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.isPrimitiveClass;
-import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface;
-import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface;
+import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KOTLIN_SYNTHETIC_CLASS;
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
 import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*;
+import static org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationUtilKt.hasJvmFieldAnnotation;
 import static org.jetbrains.kotlin.types.TypeUtils.isNullableType;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
@@ -164,18 +169,18 @@ public class AsmUtil {
 
     public static boolean isAbstractMethod(FunctionDescriptor functionDescriptor, OwnerKind kind) {
         return (functionDescriptor.getModality() == Modality.ABSTRACT
-                || isInterface(functionDescriptor.getContainingDeclaration()))
+                || isJvmInterface(functionDescriptor.getContainingDeclaration()))
                && !isStaticMethod(kind, functionDescriptor);
     }
 
     public static boolean isStaticMethod(OwnerKind kind, CallableMemberDescriptor functionDescriptor) {
         return isStaticKind(kind) ||
                JetTypeMapper.isStaticAccessor(functionDescriptor) ||
-               AnnotationsPackage.isPlatformStaticInObjectOrClass(functionDescriptor);
+               AnnotationUtilKt.isPlatformStaticInObjectOrClass(functionDescriptor);
     }
 
     public static boolean isStaticKind(OwnerKind kind) {
-        return kind == OwnerKind.PACKAGE || kind == OwnerKind.TRAIT_IMPL;
+        return kind == OwnerKind.PACKAGE || kind == OwnerKind.DEFAULT_IMPLS;
     }
 
     public static int getMethodAsmFlags(FunctionDescriptor functionDescriptor, OwnerKind kind) {
@@ -187,7 +192,11 @@ public class AsmUtil {
             }
         }
 
-        if (AnnotationsPackage.isPlatformStaticInCompanionObject(functionDescriptor)) {
+        if (functionDescriptor.getOriginal().isExternal()) {
+            flags |= Opcodes.ACC_NATIVE;
+        }
+
+        if (AnnotationUtilKt.isPlatformStaticInCompanionObject(functionDescriptor)) {
             // Native method will be a member of the class, the companion object method will be delegated to it
             flags &= ~Opcodes.ACC_NATIVE;
         }
@@ -208,7 +217,8 @@ public class AsmUtil {
             flags |= ACC_ABSTRACT;
         }
 
-        if (JetTypeMapper.isAccessor(functionDescriptor)) {
+        if (JetTypeMapper.isAccessor(functionDescriptor)
+            || AnnotationUtilKt.hasJvmSyntheticAnnotation(functionDescriptor)) {
             flags |= ACC_SYNTHETIC;
         }
 
@@ -219,9 +229,9 @@ public class AsmUtil {
         int flags = getVisibilityAccessFlag(functionDescriptor);
         flags |= getVarargsFlag(functionDescriptor);
         flags |= getDeprecatedAccessFlag(functionDescriptor);
-        if (DescriptorUtilPackage.isAnnotatedAsHidden(functionDescriptor)
+        if (DeprecationUtilKt.isAnnotatedAsHidden(functionDescriptor)
             || functionDescriptor instanceof PropertyAccessorDescriptor
-               && DescriptorUtilPackage.isAnnotatedAsHidden(((PropertyAccessorDescriptor) functionDescriptor).getCorrespondingProperty())) {
+               && DeprecationUtilKt.isAnnotatedAsHidden(((PropertyAccessorDescriptor) functionDescriptor).getCorrespondingProperty())) {
             flags |= ACC_SYNTHETIC;
         }
         return flags;
@@ -233,9 +243,13 @@ public class AsmUtil {
         if (specialCase != null) {
             return specialCase;
         }
-        Integer defaultMapping = visibilityToAccessFlag.get(descriptor.getVisibility());
+        return getDefaultVisibilityFlag(descriptor.getVisibility());
+    }
+
+    public static int getDefaultVisibilityFlag(@NotNull Visibility visibility) {
+        Integer defaultMapping = visibilityToAccessFlag.get(visibility);
         if (defaultMapping == null) {
-            throw new IllegalStateException(descriptor.getVisibility() + " is not a valid visibility in backend: " + descriptor);
+            throw new IllegalStateException(visibility + " is not a valid visibility in backend");
         }
         return defaultMapping;
     }
@@ -288,6 +302,9 @@ public class AsmUtil {
 
     public static int getDeprecatedAccessFlag(@NotNull MemberDescriptor descriptor) {
         if (descriptor instanceof PropertyAccessorDescriptor) {
+            if (((PropertyAccessorDescriptor) descriptor).getCorrespondingProperty().isConst()) {
+                return ACC_DEPRECATED;
+            }
             return KotlinBuiltIns.isDeprecated(descriptor)
                    ? ACC_DEPRECATED
                    : getDeprecatedAccessFlag(((PropertyAccessorDescriptor) descriptor).getCorrespondingProperty());
@@ -310,11 +327,11 @@ public class AsmUtil {
     @Nullable
     private static Integer specialCaseVisibility(@NotNull MemberDescriptor memberDescriptor) {
         DeclarationDescriptor containingDeclaration = memberDescriptor.getContainingDeclaration();
-        if (isInterface(containingDeclaration)) {
-            return ACC_PUBLIC;
+        Visibility memberVisibility = memberDescriptor.getVisibility();
+        if (isJvmInterface(containingDeclaration)) {
+            return memberVisibility == Visibilities.PRIVATE ? NO_FLAG_PACKAGE_PRIVATE : ACC_PUBLIC;
         }
 
-        Visibility memberVisibility = memberDescriptor.getVisibility();
         if (memberVisibility == Visibilities.LOCAL && memberDescriptor instanceof CallableMemberDescriptor) {
             return ACC_PUBLIC;
         }
@@ -324,7 +341,7 @@ public class AsmUtil {
         }
 
         if (memberDescriptor instanceof ConstructorDescriptor && isAnonymousObject(memberDescriptor.getContainingDeclaration())) {
-            return NO_FLAG_PACKAGE_PRIVATE;
+            return getVisibilityAccessFlagForAnonymous((ClassDescriptor) memberDescriptor.getContainingDeclaration());
         }
 
         if (memberDescriptor instanceof SyntheticJavaPropertyDescriptor) {
@@ -343,7 +360,7 @@ public class AsmUtil {
 
         if (memberDescriptor instanceof CallableDescriptor && memberVisibility == Visibilities.PROTECTED) {
             for (CallableDescriptor overridden : DescriptorUtils.getAllOverriddenDescriptors((CallableDescriptor) memberDescriptor)) {
-                if (isInterface(overridden.getContainingDeclaration())) {
+                if (isJvmInterface(overridden.getContainingDeclaration())) {
                     return ACC_PUBLIC;
                 }
             }
@@ -355,7 +372,7 @@ public class AsmUtil {
 
         // the following code is only for PRIVATE visibility of member
         if (memberDescriptor instanceof ConstructorDescriptor) {
-            if (isNonCompanionObject(containingDeclaration) || isEnumEntry(containingDeclaration)) {
+            if (isEnumEntry(containingDeclaration)) {
                 return NO_FLAG_PACKAGE_PRIVATE;
             }
             if (isEnumClass(containingDeclaration)) {
@@ -365,9 +382,11 @@ public class AsmUtil {
             }
         }
 
-        if (containingDeclaration instanceof PackageFragmentDescriptor) {
-            return ACC_PUBLIC;
+        if (memberDescriptor instanceof PropertyDescriptor &&
+            ((PropertyDescriptor) memberDescriptor).isConst() || hasJvmFieldAnnotation(memberDescriptor)) {
+            return null;
         }
+
         return null;
     }
 
@@ -413,7 +432,7 @@ public class AsmUtil {
             allFields.add(Pair.create(CAPTURED_THIS_FIELD, typeMapper.mapType(captureThis)));
         }
 
-        JetType captureReceiverType = closure.getCaptureReceiverType();
+        KotlinType captureReceiverType = closure.getCaptureReceiverType();
         if (captureReceiverType != null) {
             allFields.add(Pair.create(CAPTURED_RECEIVER_FIELD, typeMapper.mapType(captureReceiverType)));
         }
@@ -539,7 +558,7 @@ public class AsmUtil {
                 right.put(rightType, v);
                 genAreEqualCall(v);
 
-                if (opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ) {
+                if (opToken == KtTokens.EXCLEQ || opToken == KtTokens.EXCLEQEQEQ) {
                     genInvertBoolean(v);
                 }
                 return Unit.INSTANCE$;
@@ -619,7 +638,7 @@ public class AsmUtil {
             @NotNull CallableDescriptor parameter,
             @NotNull String name
     ) {
-        JetType type = parameter.getReturnType();
+        KotlinType type = parameter.getReturnType();
         if (type == null || isNullableType(type)) return;
         
         int index = frameMap.getIndex(parameter);
@@ -647,14 +666,14 @@ public class AsmUtil {
             @NotNull String assertMethodToCall
     ) {
         // Assertions are generated elsewhere for platform types
-        if (JvmPackage.getPLATFORM_TYPES()) return false;
+        if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) return false;
 
         if (!state.isCallAssertionsEnabled()) return false;
 
         if (!isDeclaredInJava(descriptor)) return false;
 
-        JetType type = descriptor.getReturnType();
-        if (type == null || isNullableType(TypesPackage.lowerIfFlexible(type))) return false;
+        KotlinType type = descriptor.getReturnType();
+        if (type == null || isNullableType(FlexibleTypesKt.lowerIfFlexible(type))) return false;
 
         Type asmType = state.getTypeMapper().mapReturnType(descriptor);
         if (asmType.getSort() == Type.OBJECT || asmType.getSort() == Type.ARRAY) {
@@ -735,7 +754,10 @@ public class AsmUtil {
             return false;
         }
 
-        return isNonCompanionObject(propertyDescriptor.getContainingDeclaration()) || isPropertyWithBackingFieldInOuterClass(propertyDescriptor);
+        DeclarationDescriptor container = propertyDescriptor.getContainingDeclaration();
+        return isNonCompanionObject(container) ||
+               isPropertyWithBackingFieldInOuterClass(propertyDescriptor) ||
+               (isCompanionObject(container) && isInterface(container.getContainingDeclaration()));
     }
 
     public static boolean isPropertyWithBackingFieldInOuterClass(@NotNull PropertyDescriptor propertyDescriptor) {
@@ -769,7 +791,7 @@ public class AsmUtil {
         DeclarationDescriptor propertyContainer = propertyDescriptor.getContainingDeclaration();
         return !propertyDescriptor.isVar()
                && !isExtensionProperty
-               && isCompanionObject(propertyContainer) && isTrait(propertyContainer.getContainingDeclaration())
+               && isCompanionObject(propertyContainer) && isInterface(propertyContainer.getContainingDeclaration())
                && areBothAccessorDefault(propertyDescriptor)
                && getVisibilityForSpecialPropertyBackingField(propertyDescriptor, false) == ACC_PUBLIC;
     }
@@ -813,7 +835,10 @@ public class AsmUtil {
     }
 
     public static void dup(@NotNull InstructionAdapter v, @NotNull Type type) {
-        int size = type.getSize();
+        dup(v, type.getSize());
+    }
+
+    private static void dup(@NotNull InstructionAdapter v, int size) {
         if (size == 2) {
             v.dup2();
         }
@@ -825,17 +850,63 @@ public class AsmUtil {
         }
     }
 
-    public static void writeKotlinSyntheticClassAnnotation(@NotNull ClassBuilder v, @NotNull KotlinSyntheticClass.Kind kind) {
-        AnnotationVisitor av = v.newAnnotation(Type.getObjectType(KotlinSyntheticClass.CLASS_NAME.getInternalName()).getDescriptor(), true);
+    public static void dup(@NotNull InstructionAdapter v, @NotNull Type topOfStack, @NotNull Type afterTop) {
+        if (topOfStack.getSize() == 0 && afterTop.getSize() == 0) {
+            return;
+        }
+
+        if (topOfStack.getSize() == 0) {
+            dup(v, afterTop);
+        }
+        else if (afterTop.getSize() == 0) {
+            dup(v, topOfStack);
+        }
+        else if (afterTop.getSize() == 1) {
+            if (topOfStack.getSize() == 1) {
+                dup(v, 2);
+            }
+            else {
+                v.dup2X1();
+                v.pop2();
+                v.dupX2();
+                v.dupX2();
+                v.pop();
+                v.dup2X1();
+            }
+        }
+        else {
+            //Note: it's possible to write dup3 and dup4
+            throw new UnsupportedOperationException("Don't know how generate dup3/dup4 for: " + topOfStack + " and " + afterTop);
+        }
+    }
+
+    public static void writeKotlinSyntheticClassAnnotation(@NotNull ClassBuilder v, @NotNull GenerationState state) {
+        AnnotationVisitor av = v.newAnnotation(asmDescByFqNameWithoutInnerClasses(KOTLIN_SYNTHETIC_CLASS), true);
         JvmCodegenUtil.writeAbiVersion(av);
-        av.visitEnum(
-                JvmAnnotationNames.KIND_FIELD_NAME,
-                Type.getObjectType(KotlinSyntheticClass.KIND_INTERNAL_NAME).getDescriptor(),
-                kind.toString()
-        );
+        JvmCodegenUtil.writeModuleName(av, state);
         av.visitEnd();
     }
 
+    public static void writeAnnotationData(
+            @NotNull AnnotationVisitor av,
+            @NotNull DescriptorSerializer serializer,
+            @NotNull MessageLite message
+    ) {
+        byte[] bytes = serializer.serialize(message);
+
+        JvmCodegenUtil.writeAbiVersion(av);
+        AnnotationVisitor data = av.visitArray(JvmAnnotationNames.DATA_FIELD_NAME);
+        for (String string : BitEncoding.encodeBytes(bytes)) {
+            data.visit(null, string);
+        }
+        data.visitEnd();
+        AnnotationVisitor strings = av.visitArray(JvmAnnotationNames.STRINGS_FIELD_NAME);
+        for (String string : ((JvmStringTable) serializer.getStringTable()).getStrings()) {
+            strings.visit(null, string);
+        }
+        strings.visitEnd();
+    }
+
     @NotNull
     public static String asmDescByFqNameWithoutInnerClasses(@NotNull FqName fqName) {
         return asmTypeByFqNameWithoutInnerClasses(fqName).getDescriptor();
@@ -858,6 +929,17 @@ public class AsmUtil {
         return JvmClassName.byFqNameWithoutInnerClasses(fqName).getInternalName();
     }
 
+    @NotNull
+    public static String getSimpleInternalName(@NotNull String internalName) {
+        int lastSlash = internalName.lastIndexOf('/');
+        if (lastSlash >= 0) {
+            return internalName.substring(lastSlash + 1);
+        }
+        else {
+            return internalName;
+        }
+    }
+
     public static void putJavaLangClassInstance(@NotNull InstructionAdapter v, @NotNull Type type) {
         if (isPrimitive(type)) {
             v.getstatic(boxType(type).getInternalName(), "TYPE", "Ljava/lang/Class;");
@@ -868,17 +950,16 @@ public class AsmUtil {
     }
 
     public static void wrapJavaClassIntoKClass(@NotNull InstructionAdapter v) {
-        v.invokestatic(REFLECTION, "foreignKotlinClass", Type.getMethodDescriptor(K_CLASS_TYPE, getType(Class.class)), false);
+        v.invokestatic(REFLECTION, "getOrCreateKotlinClass", Type.getMethodDescriptor(K_CLASS_TYPE, getType(Class.class)), false);
     }
 
-
     public static void wrapJavaClassesIntoKClasses(@NotNull InstructionAdapter v) {
-        v.invokestatic(REFLECTION, "foreignKotlinClasses", Type.getMethodDescriptor(K_CLASS_ARRAY_TYPE, getType(Class[].class)), false);
+        v.invokestatic(REFLECTION, "getOrCreateKotlinClasses", Type.getMethodDescriptor(K_CLASS_ARRAY_TYPE, getType(Class[].class)), false);
     }
 
     public static int getReceiverIndex(@NotNull CodegenContext context, @NotNull CallableMemberDescriptor descriptor) {
         OwnerKind kind = context.getContextKind();
         //Trait always should have this descriptor
-        return kind != OwnerKind.TRAIT_IMPL && isStaticMethod(kind, descriptor) ? 0 : 1;
+        return kind != OwnerKind.DEFAULT_IMPLS && isStaticMethod(kind, descriptor) ? 0 : 1;
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt

@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen
 import com.intellij.psi.tree.IElementType
 import org.jetbrains.kotlin.codegen.pseudoInsns.fakeAlwaysFalseIfeq
 import org.jetbrains.kotlin.codegen.pseudoInsns.fakeAlwaysTrueIfeq
-import org.jetbrains.kotlin.lexer.JetTokens
+import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.org.objectweb.asm.Label
 import org.jetbrains.org.objectweb.asm.Opcodes.*
 import org.jetbrains.org.objectweb.asm.Type
@@ -214,7 +214,7 @@ class NumberCompare(
     override fun patchOpcode(opcode: Int, v: InstructionAdapter): Int {
         when (operandType) {
             Type.FLOAT_TYPE, Type.DOUBLE_TYPE -> {
-                if (opToken == JetTokens.GT || opToken == JetTokens.GTEQ) {
+                if (opToken == KtTokens.GT || opToken == KtTokens.GTEQ) {
                     v.cmpl(operandType)
                 }
                 else {
@@ -234,12 +234,12 @@ class NumberCompare(
     companion object {
         fun getNumberCompareOpcode(opToken: IElementType): Int {
             return when (opToken) {
-                JetTokens.EQEQ, JetTokens.EQEQEQ -> IFNE
-                JetTokens.EXCLEQ, JetTokens.EXCLEQEQEQ -> IFEQ
-                JetTokens.GT -> IFLE
-                JetTokens.GTEQ -> IFLT
-                JetTokens.LT -> IFGE
-                JetTokens.LTEQ -> IFGT
+                KtTokens.EQEQ, KtTokens.EQEQEQ -> IFNE
+                KtTokens.EXCLEQ, KtTokens.EXCLEQEQEQ -> IFEQ
+                KtTokens.GT -> IFLE
+                KtTokens.GTEQ -> IFLT
+                KtTokens.LT -> IFGE
+                KtTokens.LTEQ -> IFGT
                 else -> {
                     throw UnsupportedOperationException("Don't know how to generate this condJump: " + opToken)
                 }
@@ -258,8 +258,8 @@ class ObjectCompare(
     companion object {
         fun getObjectCompareOpcode(opToken: IElementType): Int {
             return when (opToken) {
-                JetTokens.EQEQEQ -> IF_ACMPNE
-                JetTokens.EXCLEQEQEQ -> IF_ACMPEQ
+                KtTokens.EQEQEQ -> IF_ACMPNE
+                KtTokens.EXCLEQEQEQ -> IF_ACMPEQ
                 else -> throw UnsupportedOperationException("don't know how to generate this condjump")
             }
         }

compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java

@@ -18,12 +18,9 @@ package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
-import org.jetbrains.kotlin.psi.JetExpression;
+import org.jetbrains.kotlin.psi.KtExpression;
 import org.jetbrains.kotlin.psi.ValueArgument;
-import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument;
-import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument;
-import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument;
-import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument;
+import org.jetbrains.kotlin.resolve.calls.model.*;
 import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.List;
@@ -51,13 +48,17 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator {
                 "Value parameters and their types mismatch in sizes: " + valueParameters.size() + " != " + valueParameterTypes.size();
     }
 
+
     @NotNull
     @Override
-    public List<Integer> generate(@NotNull List<ResolvedValueArgument> valueArguments) {
-        boolean shouldMarkLineNumbers = codegen.isShouldMarkLineNumbers();
-        codegen.setShouldMarkLineNumbers(false);
-        List<Integer> masks = super.generate(valueArguments);
-        codegen.setShouldMarkLineNumbers(shouldMarkLineNumbers);
+    public DefaultCallMask generate(
+            @NotNull List<? extends ResolvedValueArgument> valueArgumentsByIndex,
+            @NotNull List<? extends ResolvedValueArgument> valueArgs
+    ) {
+        boolean shouldMarkLineNumbers = this.codegen.isShouldMarkLineNumbers();
+        this.codegen.setShouldMarkLineNumbers(false);
+        DefaultCallMask masks = super.generate(valueArgumentsByIndex, valueArgs);
+        this.codegen.setShouldMarkLineNumbers(shouldMarkLineNumbers);
         return masks;
     }
 
@@ -67,9 +68,9 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator {
         Type type = valueParameterTypes.get(i);
         ValueArgument valueArgument = argument.getValueArgument();
         assert valueArgument != null;
-        JetExpression argumentExpression = valueArgument.getArgumentExpression();
+        KtExpression argumentExpression = valueArgument.getArgumentExpression();
         assert argumentExpression != null : valueArgument.asElement().getText();
-        callGenerator.genValueAndPut(parameter, argumentExpression, type);
+        callGenerator.genValueAndPut(parameter, argumentExpression, type, i);
     }
 
     @Override
@@ -77,7 +78,7 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator {
         ValueParameterDescriptor parameter = valueParameters.get(i);
         Type type = valueParameterTypes.get(i);
         pushDefaultValueOnStack(type, codegen.v);
-        callGenerator.afterParameterPut(type, null, parameter);
+        callGenerator.afterParameterPut(type, null, parameter, i);
     }
 
     @Override
@@ -85,6 +86,11 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator {
         ValueParameterDescriptor parameter = valueParameters.get(i);
         Type type = valueParameterTypes.get(i);
         codegen.genVarargs(argument, parameter.getType());
-        callGenerator.afterParameterPut(type, null, parameter);
+        callGenerator.afterParameterPut(type, null, parameter, i);
+    }
+
+    @Override
+    protected void reorderArgumentsIfNeeded(@NotNull List<? extends ArgumentAndDeclIndex> actualArgsWithDeclIndex) {
+        callGenerator.reorderArgumentsIfNeeded(actualArgsWithDeclIndex, valueParameterTypes);
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java

@@ -1,124 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.codegen;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
-import org.jetbrains.kotlin.psi.JetExpression;
-import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
-import org.jetbrains.org.objectweb.asm.Type;
-
-public abstract class CallGenerator {
-
-    static class DefaultCallGenerator extends CallGenerator {
-
-        private final ExpressionCodegen codegen;
-
-        public DefaultCallGenerator(ExpressionCodegen codegen) {
-            this.codegen = codegen;
-        }
-
-        @Override
-        public void genCallInner(
-                @NotNull Callable callableMethod,
-                ResolvedCall<?> resolvedCall,
-                boolean callDefault,
-                @NotNull ExpressionCodegen codegen
-        ) {
-            if (!callDefault) {
-                callableMethod.genInvokeInstruction(codegen.v);
-            }
-            else {
-                ((CallableMethod)callableMethod).genInvokeDefaultInstruction(codegen.v);
-            }
-        }
-
-        @Override
-        public void genCallWithoutAssertions(
-                @NotNull CallableMethod method, @NotNull ExpressionCodegen codegen
-        ) {
-            method.genInvokeInstruction(codegen.v);
-        }
-
-        @Override
-        public void afterParameterPut(@NotNull Type type, StackValue stackValue, @NotNull ValueParameterDescriptor valueParameterDescriptor) {
-
-        }
-
-        @Override
-        public void putHiddenParams() {
-
-        }
-
-        @Override
-        public void genValueAndPut(
-                @NotNull ValueParameterDescriptor valueParameterDescriptor,
-                @NotNull JetExpression argumentExpression,
-                @NotNull Type parameterType
-        ) {
-            StackValue value = codegen.gen(argumentExpression);
-            value.put(parameterType, codegen.v);
-        }
-
-        @Override
-        public void putCapturedValueOnStack(
-                @NotNull StackValue stackValue, @NotNull Type valueType, int paramIndex
-        ) {
-            stackValue.put(stackValue.type, codegen.v);
-        }
-
-        @Override
-        public void putValueIfNeeded(
-                @Nullable ValueParameterDescriptor valueParameterDescriptor, @NotNull Type parameterType, @NotNull StackValue value
-        ) {
-            value.put(value.type, codegen.v);
-        }
-    }
-
-    public void genCall(@NotNull Callable callableMethod, @Nullable ResolvedCall<?> resolvedCall, boolean callDefault, @NotNull ExpressionCodegen codegen) {
-        if (resolvedCall != null) {
-            JetExpression calleeExpression = resolvedCall.getCall().getCalleeExpression();
-            if (calleeExpression != null) {
-                codegen.markStartLineNumber(calleeExpression);
-            }
-        }
-
-        genCallInner(callableMethod, resolvedCall, callDefault, codegen);
-    }
-
-    public abstract void genCallInner(@NotNull Callable callableMethod, @Nullable ResolvedCall<?> resolvedCall, boolean callDefault, @NotNull ExpressionCodegen codegen);
-
-    public abstract void genCallWithoutAssertions(@NotNull CallableMethod callableMethod, @NotNull ExpressionCodegen codegen);
-
-    public abstract void afterParameterPut(@NotNull Type type, StackValue stackValue, @NotNull ValueParameterDescriptor valueParameterDescriptor);
-
-    public abstract void genValueAndPut(
-            @NotNull ValueParameterDescriptor valueParameterDescriptor,
-            @NotNull JetExpression argumentExpression,
-            @NotNull Type parameterType
-    );
-
-    public abstract void putValueIfNeeded(@Nullable ValueParameterDescriptor valueParameterDescriptor, @NotNull Type parameterType, @NotNull StackValue value);
-
-    public abstract void putCapturedValueOnStack(
-            @NotNull StackValue stackValue,
-            @NotNull Type valueType, int paramIndex
-    );
-
-    public abstract void putHiddenParams();
-}

compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
+import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
+import org.jetbrains.org.objectweb.asm.Type
+
+abstract class CallGenerator {
+
+    internal class DefaultCallGenerator(private val codegen: ExpressionCodegen) : CallGenerator() {
+
+        override fun genCallInner(
+                callableMethod: Callable,
+                resolvedCall: ResolvedCall<*>?,
+                callDefault: Boolean,
+                codegen: ExpressionCodegen) {
+            if (!callDefault) {
+                callableMethod.genInvokeInstruction(codegen.v)
+            }
+            else {
+                (callableMethod as CallableMethod).genInvokeDefaultInstruction(codegen.v)
+            }
+        }
+
+        override fun genCallWithoutAssertions(
+                callableMethod: CallableMethod, codegen: ExpressionCodegen) {
+            callableMethod.genInvokeInstruction(codegen.v)
+        }
+
+        override fun afterParameterPut(
+                type: Type,
+                stackValue: StackValue?,
+                valueParameterDescriptor: ValueParameterDescriptor,
+                parameterIndex: Int) {
+
+        }
+
+        override fun putHiddenParams() {
+
+        }
+
+        override fun genValueAndPut(
+                valueParameterDescriptor: ValueParameterDescriptor,
+                argumentExpression: KtExpression,
+                parameterType: Type,
+                parameterIndex: Int) {
+            val value = codegen.gen(argumentExpression)
+            value.put(parameterType, codegen.v)
+        }
+
+        override fun putCapturedValueOnStack(
+                stackValue: StackValue, valueType: Type, paramIndex: Int) {
+            stackValue.put(stackValue.type, codegen.v)
+        }
+
+        override fun putValueIfNeeded(
+                valueParameterDescriptor: ValueParameterDescriptor?, parameterType: Type, value: StackValue) {
+            value.put(value.type, codegen.v)
+        }
+
+        override fun reorderArgumentsIfNeeded(actualArgsWithDeclIndex: List<ArgumentAndDeclIndex>, valueParameterTypes: List<Type>) {
+            val mark = codegen.myFrameMap.mark()
+            val reordered = actualArgsWithDeclIndex.withIndex().dropWhile {
+                it.value.declIndex == it.index
+            }
+
+            reordered.reversed().map {
+                val argumentAndDeclIndex = it.value
+                val type = valueParameterTypes.get(argumentAndDeclIndex.declIndex)
+                val stackValue = StackValue.local(codegen.frameMap.enterTemp(type), type)
+                stackValue.store(StackValue.onStack(type), codegen.v)
+                Pair(argumentAndDeclIndex.declIndex, stackValue)
+            }.sortedBy {
+                it.first
+            }.forEach {
+                it.second.put(valueParameterTypes.get(it.first), codegen.v)
+            }
+            mark.dropTo()
+        }
+    }
+
+    fun genCall(callableMethod: Callable, resolvedCall: ResolvedCall<*>?, callDefault: Boolean, codegen: ExpressionCodegen) {
+        if (resolvedCall != null) {
+            val calleeExpression = resolvedCall.call.calleeExpression
+            if (calleeExpression != null) {
+                codegen.markStartLineNumber(calleeExpression)
+            }
+        }
+
+        genCallInner(callableMethod, resolvedCall, callDefault, codegen)
+    }
+
+    abstract fun genCallInner(callableMethod: Callable, resolvedCall: ResolvedCall<*>?, callDefault: Boolean, codegen: ExpressionCodegen)
+
+    abstract fun genCallWithoutAssertions(callableMethod: CallableMethod, codegen: ExpressionCodegen)
+
+    abstract fun afterParameterPut(
+            type: Type,
+            stackValue: StackValue?,
+            valueParameterDescriptor: ValueParameterDescriptor,
+            parameterIndex: Int)
+
+    abstract fun genValueAndPut(
+            valueParameterDescriptor: ValueParameterDescriptor,
+            argumentExpression: KtExpression,
+            parameterType: Type,
+            parameterIndex: Int)
+
+    abstract fun putValueIfNeeded(
+            valueParameterDescriptor: ValueParameterDescriptor?,
+            parameterType: Type,
+            value: StackValue)
+
+    abstract fun putCapturedValueOnStack(
+            stackValue: StackValue,
+            valueType: Type, paramIndex: Int)
+
+    abstract fun putHiddenParams()
+
+    abstract fun reorderArgumentsIfNeeded(actualArgsWithDeclIndex: List<ArgumentAndDeclIndex>, valueParameterTypes: List<Type>)
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage;
+import org.jetbrains.kotlin.backend.common.bridges.ImplKt;
 import org.jetbrains.kotlin.codegen.context.ClassContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.descriptors.*;
@@ -31,13 +31,13 @@ import java.util.List;
 
 import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.enumEntryNeedSubclass;
 
-public abstract class ClassBodyCodegen extends MemberCodegen<JetClassOrObject> {
-    protected final JetClassOrObject myClass;
+public abstract class ClassBodyCodegen extends MemberCodegen<KtClassOrObject> {
+    protected final KtClassOrObject myClass;
     protected final OwnerKind kind;
     protected final ClassDescriptor descriptor;
 
     protected ClassBodyCodegen(
-            @NotNull JetClassOrObject myClass,
+            @NotNull KtClassOrObject myClass,
             @NotNull ClassContext context,
             @NotNull ClassBuilder v,
             @NotNull GenerationState state,
@@ -51,27 +51,39 @@ public abstract class ClassBodyCodegen extends MemberCodegen<JetClassOrObject> {
 
     @Override
     protected void generateBody() {
-        if (kind != OwnerKind.TRAIT_IMPL) {
+        if (kind != OwnerKind.DEFAULT_IMPLS) {
             //generate nested classes first and only then generate class body. It necessary to access to nested CodegenContexts
-            for (JetDeclaration declaration : myClass.getDeclarations()) {
+            for (KtDeclaration declaration : myClass.getDeclarations()) {
                 if (shouldProcessFirst(declaration)) {
                     generateDeclaration(declaration);
                 }
             }
         }
 
-        for (JetDeclaration declaration : myClass.getDeclarations()) {
+        for (KtDeclaration declaration : myClass.getDeclarations()) {
             if (!shouldProcessFirst(declaration)) {
                 generateDeclaration(declaration);
             }
         }
 
-        if (!DescriptorUtils.isTrait(descriptor)) {
-            for (DeclarationDescriptor memberDescriptor : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
-                if (memberDescriptor instanceof FunctionDescriptor) {
-                    FunctionDescriptor member = (FunctionDescriptor) memberDescriptor;
-                    if (!member.getKind().isReal() && BridgesPackage.findTraitImplementation(member) == null) {
-                        functionCodegen.generateBridges(member);
+        if (!DescriptorUtils.isInterface(descriptor)) {
+            for (DeclarationDescriptor memberDescriptor : DescriptorUtils.getAllDescriptors(descriptor.getDefaultType().getMemberScope())) {
+                if (memberDescriptor instanceof CallableMemberDescriptor) {
+                    CallableMemberDescriptor member = (CallableMemberDescriptor) memberDescriptor;
+                    if (!member.getKind().isReal() && ImplKt.findTraitImplementation(member) == null) {
+                        if (member instanceof FunctionDescriptor) {
+                            functionCodegen.generateBridges((FunctionDescriptor) member);
+                        }
+                        else if (member instanceof PropertyDescriptor) {
+                            PropertyGetterDescriptor getter = ((PropertyDescriptor) member).getGetter();
+                            if (getter != null) {
+                                functionCodegen.generateBridges(getter);
+                            }
+                            PropertySetterDescriptor setter = ((PropertyDescriptor) member).getSetter();
+                            if (setter != null) {
+                                functionCodegen.generateBridges(setter);
+                            }
+                        }
                     }
                 }
             }
@@ -80,27 +92,26 @@ public abstract class ClassBodyCodegen extends MemberCodegen<JetClassOrObject> {
         generatePrimaryConstructorProperties();
     }
 
-    private static boolean shouldProcessFirst(JetDeclaration declaration) {
-        return !(declaration instanceof JetProperty || declaration instanceof JetNamedFunction);
+    private static boolean shouldProcessFirst(KtDeclaration declaration) {
+        return !(declaration instanceof KtProperty || declaration instanceof KtNamedFunction);
     }
 
-
-    protected void generateDeclaration(JetDeclaration declaration) {
-        if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) {
+    protected void generateDeclaration(KtDeclaration declaration) {
+        if (declaration instanceof KtProperty || declaration instanceof KtNamedFunction) {
             genFunctionOrProperty(declaration);
         }
-        else if (declaration instanceof JetClassOrObject) {
-            if (declaration instanceof JetEnumEntry && !enumEntryNeedSubclass(bindingContext, (JetEnumEntry) declaration)) {
+        else if (declaration instanceof KtClassOrObject) {
+            if (declaration instanceof KtEnumEntry && !enumEntryNeedSubclass(bindingContext, (KtEnumEntry) declaration)) {
                 return;
             }
 
-            genClassOrObject((JetClassOrObject) declaration);
+            genClassOrObject((KtClassOrObject) declaration);
         }
     }
 
     private void generatePrimaryConstructorProperties() {
         boolean isAnnotation = descriptor.getKind() == ClassKind.ANNOTATION_CLASS;
-        for (JetParameter p : getPrimaryConstructorParameters()) {
+        for (KtParameter p : getPrimaryConstructorParameters()) {
             if (p.hasValOrVar()) {
                 PropertyDescriptor propertyDescriptor = bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, p);
                 if (propertyDescriptor != null) {
@@ -116,9 +127,9 @@ public abstract class ClassBodyCodegen extends MemberCodegen<JetClassOrObject> {
     }
 
     @NotNull
-    protected List<JetParameter> getPrimaryConstructorParameters() {
-        if (myClass instanceof JetClass) {
-            return ((JetClass) myClass).getPrimaryConstructorParameters();
+    protected List<KtParameter> getPrimaryConstructorParameters() {
+        if (myClass instanceof KtClass) {
+            return ((KtClass) myClass).getPrimaryConstructorParameters();
         }
         return Collections.emptyList();
     }

compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilder.java

@@ -20,6 +20,7 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.inline.FileMapping;
+import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
 import org.jetbrains.org.objectweb.asm.ClassVisitor;

compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java

@@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.io.DataOutputStream;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
 import org.jetbrains.kotlin.load.kotlin.PackageParts;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
 import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable;
 import org.jetbrains.org.objectweb.asm.Type;
@@ -85,9 +85,6 @@ public class ClassFileFactory implements OutputFileCollection {
         if (!isDone) {
             isDone = true;
             Collection<PackageCodegen> packageCodegens = package2codegen.values();
-            for (PackageCodegen codegen : packageCodegens) {
-                codegen.done();
-            }
             Collection<MultifileClassCodegen> multifileClassCodegens = multifileClass2codegen.values();
             for (MultifileClassCodegen codegen : multifileClassCodegens) {
                 codegen.done();
@@ -114,13 +111,13 @@ public class ClassFileFactory implements OutputFileCollection {
             sourceFiles.addAll(toIoFilesIgnoringNonPhysical(PackagePartClassUtils.getFilesWithCallables(codegen.getFiles())));
         }
 
-        for (PackageParts part : CodegenPackage.addCompiledPartsAndSort(parts, state)) {
+        for (PackageParts part : ClassFileUtilsKt.addCompiledPartsAndSort(parts, state)) {
             PackageParts.Companion.serialize(part, builder);
         }
 
         if (builder.getPackagePartsCount() != 0) {
             state.getProgress().reportOutput(sourceFiles, new File(outputFilePath));
-            generators.put(outputFilePath, new OutAndSourceFileList(KotlinPackage.toList(sourceFiles)) {
+            generators.put(outputFilePath, new OutAndSourceFileList(CollectionsKt.toList(sourceFiles)) {
                 @Override
                 public byte[] asBytes(ClassBuilderFactory factory) {
                     try {
@@ -226,7 +223,7 @@ public class ClassFileFactory implements OutputFileCollection {
     }
 
     @NotNull
-    public PackageCodegen forPackage(@NotNull FqName fqName, @NotNull Collection<JetFile> files) {
+    public PackageCodegen forPackage(@NotNull FqName fqName, @NotNull Collection<KtFile> files) {
         assert !isDone : "Already done!";
         PackageCodegen codegen = package2codegen.get(fqName);
         if (codegen == null) {
@@ -238,7 +235,7 @@ public class ClassFileFactory implements OutputFileCollection {
     }
 
     @NotNull
-    public MultifileClassCodegen forMultifileClass(@NotNull FqName facadeFqName, @NotNull Collection<JetFile> files) {
+    public MultifileClassCodegen forMultifileClass(@NotNull FqName facadeFqName, @NotNull Collection<KtFile> files) {
         assert !isDone : "Already done!";
         MultifileClassCodegen codegen = multifileClass2codegen.get(facadeFqName);
         if (codegen == null) {
@@ -337,14 +334,14 @@ public class ClassFileFactory implements OutputFileCollection {
         public abstract String asText(ClassBuilderFactory factory);
     }
 
-    public void removeInlinedClasses(Set<String> classNamesToRemove) {
+    public void removeClasses(Set<String> classNamesToRemove) {
         for (String classInternalName : classNamesToRemove) {
             generators.remove(classInternalName + ".class");
         }
     }
 
     @TestOnly
-    public List<JetFile> getInputFiles() {
+    public List<KtFile> getInputFiles() {
         return state.getFiles();
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/ClassNameCollectionClassBuilderFactory.kt

@@ -31,7 +31,7 @@ public abstract class ClassNameCollectionClassBuilderFactory(
 
     protected abstract fun handleClashingNames(internalName: String, origin: JvmDeclarationOrigin)
 
-    override fun newClassBuilder(origin: JvmDeclarationOrigin): ClassNameCollectionClassBuilder {
+    override fun newClassBuilder(origin: JvmDeclarationOrigin): DelegatingClassBuilder {
         return ClassNameCollectionClassBuilder(origin, delegate.newClassBuilder(origin))
     }
 

compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.intellij.util.ArrayUtil;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
 import org.jetbrains.kotlin.codegen.context.ClosureContext;
 import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil;
+import org.jetbrains.kotlin.codegen.serialization.JvmSerializerExtension;
 import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
@@ -34,20 +35,18 @@ import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl;
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
-import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
-import org.jetbrains.kotlin.psi.JetElement;
+import org.jetbrains.kotlin.psi.KtElement;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
-import org.jetbrains.kotlin.resolve.scopes.JetScope;
+import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
+import org.jetbrains.kotlin.resolve.scopes.MemberScope;
 import org.jetbrains.kotlin.serialization.DescriptorSerializer;
 import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.kotlin.serialization.SerializationUtil;
-import org.jetbrains.kotlin.serialization.StringTable;
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
-import org.jetbrains.kotlin.serialization.jvm.BitEncoding;
-import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.kotlin.types.expressions.OperatorConventions;
-import org.jetbrains.kotlin.utils.UtilsPackage;
+import org.jetbrains.kotlin.types.KotlinType;
+import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils;
+import org.jetbrains.kotlin.util.OperatorNameConventions;
+import org.jetbrains.kotlin.utils.FunctionsKt;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 import org.jetbrains.org.objectweb.asm.Type;
@@ -61,37 +60,33 @@ import java.util.List;
 import static org.jetbrains.kotlin.codegen.AsmUtil.*;
 import static org.jetbrains.kotlin.codegen.ExpressionCodegen.generateClassLiteralReference;
 import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConst;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.writeModuleName;
 import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLOSURE;
 import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass;
-import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass;
-import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns;
 import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*;
-import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin;
 import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
-public class ClosureCodegen extends MemberCodegen<JetElement> {
+public class ClosureCodegen extends MemberCodegen<KtElement> {
     private final FunctionDescriptor funDescriptor;
     private final ClassDescriptor classDescriptor;
     private final SamType samType;
-    private final JetType superClassType;
-    private final List<JetType> superInterfaceTypes;
+    private final KotlinType superClassType;
+    private final List<KotlinType> superInterfaceTypes;
     private final FunctionDescriptor functionReferenceTarget;
     private final FunctionGenerationStrategy strategy;
     private final CalculatedClosure closure;
     private final Type asmType;
     private final int visibilityFlag;
-    private final KotlinSyntheticClass.Kind syntheticClassKind;
 
     private Method constructor;
     private Type superClassAsmType;
 
     public ClosureCodegen(
             @NotNull GenerationState state,
-            @NotNull JetElement element,
+            @NotNull KtElement element,
             @Nullable SamType samType,
             @NotNull ClosureContext context,
-            @NotNull KotlinSyntheticClass.Kind syntheticClassKind,
             @Nullable FunctionDescriptor functionReferenceTarget,
             @NotNull FunctionGenerationStrategy strategy,
             @NotNull MemberCodegen<?> parentCodegen,
@@ -102,17 +97,16 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
         this.funDescriptor = context.getFunctionDescriptor();
         this.classDescriptor = context.getContextDescriptor();
         this.samType = samType;
-        this.syntheticClassKind = syntheticClassKind;
         this.functionReferenceTarget = functionReferenceTarget;
         this.strategy = strategy;
 
         if (samType == null) {
-            this.superInterfaceTypes = new ArrayList<JetType>();
+            this.superInterfaceTypes = new ArrayList<KotlinType>();
 
-            JetType superClassType = null;
-            for (JetType supertype : classDescriptor.getTypeConstructor().getSupertypes()) {
+            KotlinType superClassType = null;
+            for (KotlinType supertype : classDescriptor.getTypeConstructor().getSupertypes()) {
                 ClassifierDescriptor classifier = supertype.getConstructor().getDeclarationDescriptor();
-                if (DescriptorUtils.isTrait(classifier)) {
+                if (DescriptorUtils.isInterface(classifier)) {
                     superInterfaceTypes.add(supertype);
                 }
                 else {
@@ -126,7 +120,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
         }
         else {
             this.superInterfaceTypes = Collections.singletonList(samType.getType());
-            this.superClassType = getBuiltIns(funDescriptor).getAnyType();
+            this.superClassType = DescriptorUtilsKt.getBuiltIns(funDescriptor).getAnyType();
         }
 
         this.closure = bindingContext.get(CLOSURE, classDescriptor);
@@ -148,7 +142,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
         sw.writeSuperclassEnd();
         String[] superInterfaceAsmTypes = new String[superInterfaceTypes.size()];
         for (int i = 0; i < superInterfaceTypes.size(); i++) {
-            JetType superInterfaceType = superInterfaceTypes.get(i);
+            KotlinType superInterfaceType = superInterfaceTypes.get(i);
             sw.writeInterface();
             superInterfaceAsmTypes[i] = typeMapper.mapSupertype(superInterfaceType, sw).getInternalName();
             sw.writeInterfaceEnd();
@@ -189,7 +183,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
                 typeMapper.mapSignature(funDescriptor).getAsmMethod()
         );
 
-        functionCodegen.generateMethod(OtherOrigin(element, funDescriptor), funDescriptor, strategy);
+        functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(element, funDescriptor), funDescriptor, strategy);
 
         //TODO: rewrite cause ugly hack
         if (samType != null) {
@@ -200,8 +194,8 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
 
             descriptorForBridges
                     .initialize(null, erasedInterfaceFunction.getDispatchReceiverParameter(), erasedInterfaceFunction.getTypeParameters(),
-                                erasedInterfaceFunction.getValueParameters(), erasedInterfaceFunction.getReturnType(), Modality.OPEN,
-                                erasedInterfaceFunction.getVisibility());
+                                erasedInterfaceFunction.getValueParameters(), erasedInterfaceFunction.getReturnType(),
+                                Modality.OPEN, erasedInterfaceFunction.getVisibility());
 
             descriptorForBridges.addOverriddenDescriptor(erasedInterfaceFunction);
             functionCodegen.generateBridges(descriptorForBridges);
@@ -211,38 +205,33 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
             generateFunctionReferenceMethods(functionReferenceTarget);
         }
 
-        this.constructor = generateConstructor();
-
-        if (isConst(closure)) {
-            generateConstInstance(asmType, asmType, UtilsPackage.<InstructionAdapter>doNothing());
-        }
-
-        genClosureFields(closure, v, typeMapper);
-
         functionCodegen.generateDefaultIfNeeded(
                 context.intoFunction(funDescriptor), funDescriptor, context.getContextKind(), DefaultParameterValueLoader.DEFAULT, null
         );
+
+        this.constructor = generateConstructor();
+
+        if (isConst(closure)) {
+            generateConstInstance(asmType, asmType, FunctionsKt.<InstructionAdapter>doNothing());
+        }
+
+        genClosureFields(closure, v, typeMapper);
     }
 
     @Override
     protected void generateKotlinAnnotation() {
-        writeKotlinSyntheticClassAnnotation(v, syntheticClassKind);
+        writeKotlinSyntheticClassAnnotation(v, state);
 
         DescriptorSerializer serializer =
-                DescriptorSerializer.createTopLevel(new JvmSerializerExtension(v.getSerializationBindings(), typeMapper));
+                DescriptorSerializer.createForLambda(
+                        new JvmSerializerExtension(v.getSerializationBindings(), typeMapper, state.getUseTypeTableInSerializer())
+                );
 
-        ProtoBuf.Callable callableProto = serializer.callableProto(funDescriptor).build();
+        ProtoBuf.Function functionProto = serializer.functionProto(funDescriptor).build();
 
-        StringTable strings = serializer.getStringTable();
-        NameResolver nameResolver = new NameResolver(strings.serializeSimpleNames(), strings.serializeQualifiedNames());
-
-        AnnotationVisitor av = v.getVisitor().visitAnnotation(asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_CALLABLE), true);
-        JvmCodegenUtil.writeAbiVersion(av);
-        AnnotationVisitor array = av.visitArray(JvmAnnotationNames.DATA_FIELD_NAME);
-        for (String string : BitEncoding.encodeBytes(SerializationUtil.serializeCallableData(nameResolver, callableProto))) {
-            array.visit(null, string);
-        }
-        array.visitEnd();
+        AnnotationVisitor av = v.getVisitor().visitAnnotation(asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_FUNCTION), true);
+        writeAnnotationData(av, serializer, functionProto);
+        writeModuleName(av, state);
         av.visitEnd();
     }
 
@@ -271,7 +260,9 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
                         }
 
                         if (functionReferenceTarget != null) {
-                            v.invokestatic(REFLECTION, "function", Type.getMethodDescriptor(K_FUNCTION, FUNCTION_REFERENCE), false);
+                            if (!"true".equalsIgnoreCase(System.getProperty("kotlin.jvm.optimize.callable.references"))) {
+                                v.invokestatic(REFLECTION, "function", Type.getMethodDescriptor(K_FUNCTION, FUNCTION_REFERENCE), false);
+                            }
                         }
 
                         return Unit.INSTANCE$;
@@ -284,7 +275,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
         if (bridge.equals(delegate)) return;
 
         MethodVisitor mv =
-                v.newMethod(OtherOrigin(element, funDescriptor), ACC_PUBLIC | ACC_BRIDGE,
+                v.newMethod(JvmDeclarationOriginKt.OtherOrigin(element, funDescriptor), ACC_PUBLIC | ACC_BRIDGE,
                             bridge.getName(), bridge.getDescriptor(), null, ArrayUtil.EMPTY_STRING_ARRAY);
 
         if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return;
@@ -292,14 +283,14 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
         mv.visitCode();
 
         InstructionAdapter iv = new InstructionAdapter(mv);
-        ImplementationBodyCodegen.markLineNumberForSyntheticFunction(DescriptorUtils.getParentOfType(funDescriptor, ClassDescriptor.class), iv);
+        MemberCodegen.markLineNumberForSyntheticFunction(DescriptorUtils.getParentOfType(funDescriptor, ClassDescriptor.class), iv);
 
         iv.load(0, asmType);
 
         Type[] myParameterTypes = bridge.getArgumentTypes();
 
-        List<ParameterDescriptor> calleeParameters = KotlinPackage.plus(
-                UtilsPackage.<ParameterDescriptor>singletonOrEmptyList(funDescriptor.getExtensionReceiverParameter()),
+        List<ParameterDescriptor> calleeParameters = CollectionsKt.<ParameterDescriptor>plus(
+                org.jetbrains.kotlin.utils.CollectionsKt.<ParameterDescriptor>singletonOrEmptyList(funDescriptor.getExtensionReceiverParameter()),
                 funDescriptor.getValueParameters()
         );
 
@@ -329,7 +320,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
             if (generateBody) {
                 mv.visitCode();
                 InstructionAdapter iv = new InstructionAdapter(mv);
-                generateCallableReferenceDeclarationContainer(iv, descriptor, typeMapper);
+                generateCallableReferenceDeclarationContainer(iv, descriptor, state);
                 iv.areturn(K_DECLARATION_CONTAINER_TYPE);
                 FunctionCodegen.endVisit(iv, "function reference getOwner", element);
             }
@@ -363,24 +354,24 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
     public static void generateCallableReferenceDeclarationContainer(
             @NotNull InstructionAdapter iv,
             @NotNull CallableDescriptor descriptor,
-            @NotNull JetTypeMapper typeMapper
+            @NotNull GenerationState state
     ) {
         DeclarationDescriptor container = descriptor.getContainingDeclaration();
         if (container instanceof ClassDescriptor) {
             // TODO: getDefaultType() here is wrong and won't work for arrays
-            StackValue value = generateClassLiteralReference(typeMapper, ((ClassDescriptor) container).getDefaultType());
+            StackValue value = generateClassLiteralReference(state.getTypeMapper(), ((ClassDescriptor) container).getDefaultType());
             value.put(K_CLASS_TYPE, iv);
         }
         else if (container instanceof PackageFragmentDescriptor) {
-            String packageClassInternalName = PackageClassUtils.getPackageClassInternalName(
-                    ((PackageFragmentDescriptor) container).getFqName()
-            );
-            iv.getstatic(packageClassInternalName, JvmAbi.KOTLIN_PACKAGE_FIELD_NAME, K_PACKAGE_TYPE.getDescriptor());
+            iv.aconst(state.getTypeMapper().mapOwner(descriptor));
+            iv.aconst(state.getModuleName());
+            iv.invokestatic(REFLECTION, "getOrCreateKotlinPackage",
+                            Type.getMethodDescriptor(K_DECLARATION_CONTAINER_TYPE, getType(Class.class), getType(String.class)), false);
         }
         else if (container instanceof ScriptDescriptor) {
             // TODO: correct container for scripts (KScript?)
             StackValue value = generateClassLiteralReference(
-                    typeMapper, ((ScriptDescriptor) container).getClassDescriptor().getDefaultType()
+                    state.getTypeMapper(), ((ScriptDescriptor) container).getClassDescriptor().getDefaultType()
             );
             value.put(K_CLASS_TYPE, iv);
         }
@@ -396,8 +387,8 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
         Type[] argTypes = fieldListToTypeArray(args);
 
         Method constructor = new Method("<init>", Type.VOID_TYPE, argTypes);
-        MethodVisitor mv = v.newMethod(OtherOrigin(element, funDescriptor), visibilityFlag, "<init>", constructor.getDescriptor(), null,
-                                        ArrayUtil.EMPTY_STRING_ARRAY);
+        MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(element, funDescriptor), visibilityFlag, "<init>", constructor.getDescriptor(), null,
+                                       ArrayUtil.EMPTY_STRING_ARRAY);
         if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
             mv.visitCode();
             InstructionAdapter iv = new InstructionAdapter(mv);
@@ -440,7 +431,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
             Type type = typeMapper.mapType(captureThis);
             args.add(FieldInfo.createForHiddenField(ownerType, type, CAPTURED_THIS_FIELD));
         }
-        JetType captureReceiverType = closure.getCaptureReceiverType();
+        KotlinType captureReceiverType = closure.getCaptureReceiverType();
         if (captureReceiverType != null) {
             args.add(FieldInfo.createForHiddenField(ownerType, typeMapper.mapType(captureReceiverType), CAPTURED_RECEIVER_FIELD));
         }
@@ -454,7 +445,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
                                   : typeMapper.mapType((VariableDescriptor) descriptor);
                 args.add(FieldInfo.createForHiddenField(ownerType, type, "$" + descriptor.getName().asString()));
             }
-            else if (DescriptorUtils.isLocalFunction(descriptor)) {
+            else if (ExpressionTypingUtils.isLocalFunction(descriptor)) {
                 Type classType = asmTypeForAnonymousClass(bindingContext, (FunctionDescriptor) descriptor);
                 args.add(FieldInfo.createForHiddenField(ownerType, classType, "$" + descriptor.getName().asString()));
             }
@@ -477,9 +468,9 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
     public static FunctionDescriptor getErasedInvokeFunction(@NotNull FunctionDescriptor elementDescriptor) {
         int arity = elementDescriptor.getValueParameters().size();
         ClassDescriptor elementClass = elementDescriptor.getExtensionReceiverParameter() == null
-                                   ? getBuiltIns(elementDescriptor).getFunction(arity)
-                                   : getBuiltIns(elementDescriptor).getExtensionFunction(arity);
-        JetScope scope = elementClass.getDefaultType().getMemberScope();
-        return scope.getFunctions(OperatorConventions.INVOKE, NoLookupLocation.FROM_BACKEND).iterator().next();
+                                   ? DescriptorUtilsKt.getBuiltIns(elementDescriptor).getFunction(arity)
+                                   : DescriptorUtilsKt.getBuiltIns(elementDescriptor).getExtensionFunction(arity);
+        MemberScope scope = elementClass.getDefaultType().getMemberScope();
+        return scope.getContributedFunctions(OperatorNameConventions.INVOKE, NoLookupLocation.FROM_BACKEND).iterator().next();
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt

@@ -19,16 +19,9 @@ package org.jetbrains.kotlin.codegen
 import org.jetbrains.kotlin.fileClasses.JvmFileClassInfo
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
 import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider
-import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.KtFile
 
-public class CodegenFileClassesProvider(private val packageFacadesAsMultifileClasses: Boolean) : JvmFileClassesProvider {
-    override public fun getFileClassInfo(file: JetFile): JvmFileClassInfo {
-        val fileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(file)
-        if (packageFacadesAsMultifileClasses && !fileClassInfo.isMultifileClass) {
-            return JvmFileClassUtil.getMultifilePackageFacadePartInfo(file)
-        }
-        else {
-            return fileClassInfo
-        }
-    }
+public class CodegenFileClassesProvider : JvmFileClassesProvider {
+    override public fun getFileClassInfo(file: KtFile): JvmFileClassInfo =
+            JvmFileClassUtil.getFileClassInfoNoResolve(file)
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java

@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.*;
 
-public class CodegenStatementVisitor extends JetVisitor<StackValue, StackValue> {
+public class CodegenStatementVisitor extends KtVisitor<StackValue, StackValue> {
     private final ExpressionCodegen codegen;
 
     public CodegenStatementVisitor(ExpressionCodegen codegen) {
@@ -27,38 +27,38 @@ public class CodegenStatementVisitor extends JetVisitor<StackValue, StackValue>
     }
 
     @Override
-    public StackValue visitJetElement(@NotNull JetElement element, StackValue receiver) {
+    public StackValue visitKtElement(@NotNull KtElement element, StackValue receiver) {
         return element.accept(codegen, receiver);
     }
 
     @Override
-    public StackValue visitIfExpression(@NotNull JetIfExpression expression, StackValue receiver) {
+    public StackValue visitIfExpression(@NotNull KtIfExpression expression, StackValue receiver) {
         return codegen.generateIfExpression(expression, true);
     }
 
     @Override
-    public StackValue visitTryExpression(@NotNull JetTryExpression expression, StackValue data) {
+    public StackValue visitTryExpression(@NotNull KtTryExpression expression, StackValue data) {
         return codegen.generateTryExpression(expression, true);
     }
 
     @Override
-    public StackValue visitNamedFunction(@NotNull JetNamedFunction function, StackValue data) {
+    public StackValue visitNamedFunction(@NotNull KtNamedFunction function, StackValue data) {
         return codegen.visitNamedFunction(function, data, true);
     }
 
     @Override
-    public StackValue visitWhenExpression(@NotNull JetWhenExpression expression, StackValue data) {
+    public StackValue visitWhenExpression(@NotNull KtWhenExpression expression, StackValue data) {
         return codegen.generateWhenExpression(expression, true);
     }
 
     @Override
-    public StackValue visitBlockExpression(@NotNull JetBlockExpression expression, StackValue data) {
+    public StackValue visitBlockExpression(@NotNull KtBlockExpression expression, StackValue data) {
         return codegen.generateBlock(expression, true);
     }
 
     @Override
-    public StackValue visitLabeledExpression(@NotNull JetLabeledExpression expression, StackValue receiver) {
-        JetExpression baseExpression = expression.getBaseExpression();
+    public StackValue visitLabeledExpression(@NotNull KtLabeledExpression expression, StackValue receiver) {
+        KtExpression baseExpression = expression.getBaseExpression();
         assert baseExpression != null : "Label expression should have base one: " + expression.getText();
         return baseExpression.accept(this, receiver);
     }

compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt

@@ -20,7 +20,9 @@ import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
-import org.jetbrains.kotlin.codegen.MutableClassDescriptor
+import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.SpecialSignatureInfo
+import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.getSpecialSignatureInfo
+import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.isBuiltinWithSpecialDescriptorInJvm
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.OverrideResolver
 import org.jetbrains.kotlin.resolve.OverridingUtil
@@ -28,10 +30,8 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
 import org.jetbrains.kotlin.types.*
-import org.jetbrains.kotlin.types.checker.JetTypeChecker
-import org.jetbrains.org.objectweb.asm.Opcodes.ACC_ABSTRACT
-import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PUBLIC
-import org.jetbrains.org.objectweb.asm.Opcodes.ACC_SYNTHETIC
+import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
+import org.jetbrains.org.objectweb.asm.Opcodes.*
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import java.util.ArrayList
 import java.util.HashSet
@@ -97,8 +97,40 @@ class CollectionStubMethodGenerator(
                     // errors when compiling Java against such classes because one of them doesn't seem to override the generic method
                     // declared in the Java Collection interface (can't override generic with erased). So we maintain an additional set of
                     // methods which need to be generated with the ACC_SYNTHETIC flag
-                    val originalSignature = method.findOverriddenFromDirectSuperClass(mutableClass)!!.getOriginal().signature()
-                    if (originalSignature.getAsmMethod() != signature.getAsmMethod()) {
+                    val overriddenMethod = method.findOverriddenFromDirectSuperClass(mutableClass)!!
+                    val originalSignature = overriddenMethod.original.signature()
+                    var specialSignature: JvmMethodSignature? = null
+
+                    if (overriddenMethod.isBuiltinWithSpecialDescriptorInJvm()) {
+                        // Stubs for remove(Ljava/lang/Object;)Z and remove(I) should not be synthetic
+                        // Otherwise Javac will not see it
+                        val overriddenMethodSignature = overriddenMethod.signature()
+                        val genericSignatureInfo = overriddenMethod.getSpecialSignatureInfo()
+
+                        val specialGenericSignature =
+                                if (genericSignatureInfo != null)
+                                    genericSignatureInfo.signature
+                                else
+                                    overriddenMethodSignature.genericsSignature
+
+                        val (asmMethod, valueParameters) =
+                                // if remove(E) in Kotlin -> remove(Object) in Java
+                                // so choose original signature
+                                if (genericSignatureInfo == SpecialSignatureInfo.GENERIC_PARAMETER)
+                                    Pair(originalSignature.asmMethod, originalSignature.valueParameters)
+                                else
+                                    Pair(overriddenMethodSignature.asmMethod, overriddenMethodSignature.valueParameters)
+
+                        specialSignature = JvmMethodSignature(
+                                asmMethod,
+                                specialGenericSignature,
+                                valueParameters
+                        )
+
+                        methodStubsToGenerate.add(specialSignature)
+                    }
+
+                    if (originalSignature.asmMethod != signature.asmMethod && originalSignature.asmMethod != specialSignature?.asmMethod) {
                         syntheticStubsToGenerate.add(originalSignature)
                     }
                 }
@@ -155,7 +187,7 @@ class CollectionStubMethodGenerator(
         return ourSuperCollectionClasses.filter { klass -> klass.readOnlyClass !in redundantClasses }
     }
 
-    private fun Collection<JetType>.classes(): Collection<ClassDescriptor> =
+    private fun Collection<KotlinType>.classes(): Collection<ClassDescriptor> =
             this.map { it.getConstructor().getDeclarationDescriptor() as ClassDescriptor }
 
     private fun findFakeOverridesForMethodsFromMutableCollection(
@@ -167,7 +199,7 @@ class CollectionStubMethodGenerator(
         OverrideResolver.generateOverridesInAClass(klass, listOf(), object : OverridingUtil.DescriptorSink {
             override fun addFakeOverride(fakeOverride: CallableMemberDescriptor) {
                 if (fakeOverride !is FunctionDescriptor) return
-                if (fakeOverride.findOverriddenFromDirectSuperClass(mutableCollectionClass) != null) {
+                if (fakeOverride.findOverriddenFromDirectSuperClass(mutableCollectionClass)?.kind == DECLARATION) {
                     result.add(fakeOverride)
                 }
             }
@@ -181,13 +213,13 @@ class CollectionStubMethodGenerator(
         return result
     }
 
-    private fun Collection<JetType>.findMostSpecificTypeForClass(klass: ClassDescriptor): JetType {
+    private fun Collection<KotlinType>.findMostSpecificTypeForClass(klass: ClassDescriptor): KotlinType {
         val types = this.filter { it.getConstructor().getDeclarationDescriptor() == klass }
         if (types.isEmpty()) error("No supertype of $klass in $this")
         if (types.size() == 1) return types.first()
         // Find the first type in the list such that it's a subtype of every other type in that list
         return types.first { type ->
-            types.all { other -> JetTypeChecker.DEFAULT.isSubtypeOf(type, other) }
+            types.all { other -> KotlinTypeChecker.DEFAULT.isSubtypeOf(type, other) }
         }
     }
 
@@ -207,8 +239,8 @@ class CollectionStubMethodGenerator(
         return this.getOverriddenDescriptors().firstOrNull { it.getContainingDeclaration() == classDescriptor }
     }
 
-    private fun newType(classDescriptor: ClassDescriptor, typeArguments: List<TypeProjection>): JetType {
-        return JetTypeImpl.create(Annotations.EMPTY, classDescriptor, false, typeArguments)
+    private fun newType(classDescriptor: ClassDescriptor, typeArguments: List<TypeProjection>): KotlinType {
+        return KotlinTypeImpl.create(Annotations.EMPTY, classDescriptor, false, typeArguments)
     }
 
     private fun FunctionDescriptor.signature(): JvmMethodSignature = typeMapper.mapSignature(this)

compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallMask.kt

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import org.jetbrains.org.objectweb.asm.Type
+import java.util.*
+
+class DefaultCallMask(val size: Int) {
+
+    val bits: BitSet = BitSet(size)
+
+    fun mark(index: Int) {
+        assert (index < size) {
+            "Mask index should be less then size, but $index >= $size"
+        }
+        bits.set(index)
+    }
+
+    fun toInts(): List<Int> {
+        if (bits.isEmpty || size == 0) {
+            return emptyList()
+        }
+
+        val masks = ArrayList<Int>(1)
+
+        var mask = 0
+        for (i in 0..size - 1) {
+            if (i != 0 && i % Integer.SIZE == 0) {
+                masks.add(mask)
+                mask = 0;
+            }
+            mask = mask or if (bits.get(i)) 1 shl (i % Integer.SIZE) else 0
+        }
+        masks.add(mask)
+
+        return masks
+    }
+
+    public fun generateOnStackIfNeeded(callGenerator: CallGenerator): Boolean {
+        val toInts = toInts()
+        for (mask in toInts) {
+            callGenerator.putValueIfNeeded(null, Type.INT_TYPE, StackValue.constant(mask, Type.INT_TYPE))
+        }
+        return toInts.isNotEmpty();
+    }
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
-import org.jetbrains.kotlin.psi.JetParameter;
+import org.jetbrains.kotlin.psi.KtParameter;
 
 import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
 
@@ -31,7 +31,7 @@ public interface DefaultParameterValueLoader {
                 ValueParameterDescriptor descriptor,
                 ExpressionCodegen codegen
         ) {
-            JetParameter jetParameter = (JetParameter) descriptorToDeclaration(descriptor);
+            KtParameter jetParameter = (KtParameter) descriptorToDeclaration(descriptor);
             assert jetParameter != null;
             return codegen.gen(jetParameter.getDefaultValue());
         }

compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt

@@ -19,9 +19,9 @@ package org.jetbrains.kotlin.codegen
 import org.jetbrains.kotlin.codegen.binding.CodegenBinding
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.psi.JetClass
-import org.jetbrains.kotlin.psi.JetClassOrObject
-import org.jetbrains.kotlin.psi.JetElement
+import org.jetbrains.kotlin.psi.KtClass
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes
 import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmOverloadsAnnotation
@@ -38,13 +38,15 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
      * If all of the parameters of the specified constructor declare default values,
      * generates a no-argument constructor that passes default values for all arguments.
      */
-    fun generateConstructorOverloadsIfNeeded(
+    fun generatePrimaryConstructorOverloadsIfNeeded(
             constructorDescriptor: ConstructorDescriptor,
             classBuilder: ClassBuilder,
             contextKind: OwnerKind,
-            classOrObject: JetClassOrObject
+            classOrObject: KtClassOrObject
     ) {
-        if (generateOverloadsIfNeeded(classOrObject, constructorDescriptor, constructorDescriptor, contextKind, classBuilder)) {
+        val methodElement = classOrObject.getPrimaryConstructor() ?: classOrObject
+
+        if (generateOverloadsIfNeeded(methodElement, constructorDescriptor, constructorDescriptor, contextKind, classBuilder)) {
             return
         }
 
@@ -52,7 +54,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
             return
         }
 
-        generateOverloadWithSubstitutedParameters(constructorDescriptor, constructorDescriptor, classBuilder, classOrObject, contextKind,
+        generateOverloadWithSubstitutedParameters(constructorDescriptor, constructorDescriptor, classBuilder, methodElement, contextKind,
                                                   constructorDescriptor.countDefaultParameters())
     }
 
@@ -64,13 +66,13 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
      *
      * @param functionDescriptor the method for which the overloads are generated
      * @param delegateFunctionDescriptor the method descriptor for the implementation that we need to call
-     *     (same as [functionDescriptor] in all cases except for companion object methods annotated with [platformStatic],
+     *     (same as [functionDescriptor] in all cases except for companion object methods annotated with @JvmStatic,
      *     where [functionDescriptor] is the static method in the main class and [delegateFunctionDescriptor] is the
      *     implementation in the companion object class)
      * @return true if the overloads annotation was found on the element, false otherwise
      */
     fun generateOverloadsIfNeeded(
-            methodElement: JetElement?,
+            methodElement: KtElement?,
             functionDescriptor: FunctionDescriptor,
             delegateFunctionDescriptor: FunctionDescriptor,
             contextKind: OwnerKind,
@@ -100,7 +102,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
      *
      * @param functionDescriptor the method for which the overloads are generated
      * @param delegateFunctionDescriptor the method descriptor for the implementation that we need to call
-     *     (same as [functionDescriptor] in all cases except for companion object methods annotated with [platformStatic],
+     *     (same as [functionDescriptor] in all cases except for companion object methods annotated with @JvmStatic,
      *     where [functionDescriptor] is the static method in the main class and [delegateFunctionDescriptor] is the
      *     implementation in the companion object class)
      * @param methodElement the PSI element for the method implementation (used in diagnostic messages only)
@@ -109,7 +111,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
             functionDescriptor: FunctionDescriptor,
             delegateFunctionDescriptor: FunctionDescriptor,
             classBuilder: ClassBuilder,
-            methodElement: JetElement?,
+            methodElement: KtElement?,
             contextKind: OwnerKind,
             substituteCount: Int
     ) {
@@ -173,7 +175,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
             }
             else {
                 AsmUtil.pushDefaultValueOnStack(paramType, v)
-                val i = parameterDescriptor.getIndex()
+                val i = parameterDescriptor.index
                 if (i != 0 && i % Integer.SIZE == 0) {
                     masks.add(mask)
                     mask = 0
@@ -208,7 +210,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
         return functionDescriptor.getValueParameters().filter { !it.declaresDefaultValue() || --remainingCount >= 0 }
     }
 
-    private fun isEmptyConstructorNeeded(constructorDescriptor: ConstructorDescriptor, classOrObject: JetClassOrObject): Boolean {
+    private fun isEmptyConstructorNeeded(constructorDescriptor: ConstructorDescriptor, classOrObject: KtClassOrObject): Boolean {
         val classDescriptor = constructorDescriptor.getContainingDeclaration()
         if (classDescriptor.getKind() != ClassKind.CLASS) return false
 
@@ -220,12 +222,12 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
             return false
 
         if (constructorDescriptor.getValueParameters().isEmpty()) return false
-        if (classOrObject is JetClass && hasSecondaryConstructorsWithNoParameters(classOrObject)) return false
+        if (classOrObject is KtClass && hasSecondaryConstructorsWithNoParameters(classOrObject)) return false
 
         return constructorDescriptor.getValueParameters().all { it.declaresDefaultValue() }
     }
 
-    private fun hasSecondaryConstructorsWithNoParameters(klass: JetClass) =
+    private fun hasSecondaryConstructorsWithNoParameters(klass: KtClass) =
         klass.getSecondaryConstructors().any { it.getValueParameters().isEmpty() }
 
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/DelegatingClassBuilder.java

@@ -20,6 +20,7 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.inline.FileMapping;
+import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
 import org.jetbrains.org.objectweb.asm.ClassVisitor;

compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java

@@ -22,20 +22,28 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.org.objectweb.asm.Type;
 
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonCompanionObject;
 
 public class FieldInfo {
+
+    private static final CompanionObjectMapping COMPANION_OBJECT_MAPPING = new CompanionObjectMapping(JvmPlatform.INSTANCE.getBuiltIns());
+
     @NotNull
     public static FieldInfo createForSingleton(@NotNull ClassDescriptor classDescriptor, @NotNull JetTypeMapper typeMapper) {
-        if (!classDescriptor.getKind().isSingleton()) {
+        return createForSingleton(classDescriptor, typeMapper, false);
+    }
+
+    @NotNull
+    public static FieldInfo createForSingleton(@NotNull ClassDescriptor classDescriptor, @NotNull JetTypeMapper typeMapper, boolean oldSingleton) {
+        if (!classDescriptor.getKind().isSingleton() || DescriptorUtils.isEnumEntry(classDescriptor)) {
             throw new UnsupportedOperationException("Can't create singleton field for class: " + classDescriptor);
         }
 
-        if (isNonCompanionObject(classDescriptor) || CompanionObjectMapping.hasMappingToObject(classDescriptor)) {
-            Type type = typeMapper.mapType(classDescriptor);
-            return new FieldInfo(type, type, JvmAbi.INSTANCE_FIELD, true);
+        if (isNonCompanionObject(classDescriptor) || COMPANION_OBJECT_MAPPING.hasMappingToObject(classDescriptor)) {
+            return createSingletonViaInstance(classDescriptor, typeMapper, oldSingleton);
         }
         else {
             ClassDescriptor ownerDescriptor = DescriptorUtils.getParentOfType(classDescriptor, ClassDescriptor.class);
@@ -45,6 +53,16 @@ public class FieldInfo {
         }
     }
 
+    @NotNull
+    public static FieldInfo createSingletonViaInstance(
+            @NotNull ClassDescriptor classDescriptor,
+            @NotNull JetTypeMapper typeMapper,
+            boolean oldSingleton
+    ) {
+        Type type = typeMapper.mapType(classDescriptor);
+        return new FieldInfo(type, type, oldSingleton ? JvmAbi.DEPRECATED_INSTANCE_FIELD : JvmAbi.INSTANCE_FIELD, true);
+    }
+
     @NotNull
     public static FieldInfo createForHiddenField(@NotNull Type owner, @NotNull Type fieldType, @NotNull String fieldName) {
         return new FieldInfo(owner, fieldType, fieldName, false);

compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java

@@ -25,12 +25,10 @@ import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.backend.common.bridges.Bridge;
-import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage;
+import org.jetbrains.kotlin.backend.common.bridges.ImplKt;
 import org.jetbrains.kotlin.codegen.annotation.AnnotatedWithOnlyTargetedAnnotations;
-import org.jetbrains.kotlin.codegen.context.CodegenContext;
-import org.jetbrains.kotlin.codegen.context.CodegenContextUtil;
-import org.jetbrains.kotlin.codegen.context.DelegatingFacadeContext;
-import org.jetbrains.kotlin.codegen.context.MethodContext;
+import org.jetbrains.kotlin.codegen.context.*;
+import org.jetbrains.kotlin.codegen.intrinsics.TypeIntrinsics;
 import org.jetbrains.kotlin.codegen.optimization.OptimizationMethodVisitor;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
@@ -39,22 +37,27 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotated;
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget;
 import org.jetbrains.kotlin.jvm.RuntimeAssertionInfo;
-import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeDeclarationsPackage;
+import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature;
+import org.jetbrains.kotlin.load.java.JvmAbi;
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
+import org.jetbrains.kotlin.load.java.SpecialBuiltinMembers;
+import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeKt;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.psi.JetNamedFunction;
+import org.jetbrains.kotlin.psi.KtNamedFunction;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
-import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage;
-import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilPackage;
+import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt;
+import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt;
 import org.jetbrains.kotlin.resolve.constants.ArrayValue;
 import org.jetbrains.kotlin.resolve.constants.ConstantValue;
 import org.jetbrains.kotlin.resolve.constants.KClassValue;
-import org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind;
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature;
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature;
+import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
@@ -72,13 +75,13 @@ import java.util.Set;
 
 import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.isNullableAny;
 import static org.jetbrains.kotlin.codegen.AsmUtil.*;
-import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*;
+import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.*;
 import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION;
 import static org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget.*;
 import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.getSourceFromDescriptor;
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
 import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE;
-import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.*;
+import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.*;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
 public class FunctionCodegen {
@@ -103,13 +106,13 @@ public class FunctionCodegen {
         this.memberCodegen = memberCodegen;
     }
 
-    public void gen(@NotNull JetNamedFunction function) {
+    public void gen(@NotNull KtNamedFunction function) {
         SimpleFunctionDescriptor functionDescriptor = bindingContext.get(BindingContext.FUNCTION, function);
         assert functionDescriptor != null : "No descriptor for function " + function.getText() + "\n" +
                                             "in " + function.getContainingFile().getVirtualFile();
 
-        if (owner.getContextKind() != OwnerKind.TRAIT_IMPL || function.hasBody()) {
-            generateMethod(OtherOrigin(function, functionDescriptor), functionDescriptor,
+        if (owner.getContextKind() != OwnerKind.DEFAULT_IMPLS || function.hasBody()) {
+            generateMethod(JvmDeclarationOriginKt.OtherOrigin(function, functionDescriptor), functionDescriptor,
                            new FunctionGenerationStrategy.FunctionDefault(state, functionDescriptor, function));
         }
 
@@ -120,7 +123,7 @@ public class FunctionCodegen {
     }
 
     public void generateOverloadsWithDefaultValues(
-            @Nullable JetNamedFunction function,
+            @Nullable KtNamedFunction function,
             @NotNull FunctionDescriptor functionDescriptor,
             @NotNull FunctionDescriptor delegateFunctionDescriptor
     ) {
@@ -144,11 +147,17 @@ public class FunctionCodegen {
             @NotNull FunctionGenerationStrategy strategy
     ) {
         OwnerKind contextKind = methodContext.getContextKind();
+        if (isInterface(functionDescriptor.getContainingDeclaration()) &&
+            functionDescriptor.getVisibility() == Visibilities.PRIVATE &&
+            contextKind != OwnerKind.DEFAULT_IMPLS) {
+            return;
+        }
+
         JvmMethodSignature jvmSignature = typeMapper.mapSignature(functionDescriptor, contextKind);
         Method asmMethod = jvmSignature.getAsmMethod();
 
         int flags = getMethodAsmFlags(functionDescriptor, contextKind);
-        boolean isNative = NativeDeclarationsPackage.hasNativeAnnotation(functionDescriptor);
+        boolean isNative = NativeKt.hasNativeAnnotation(functionDescriptor);
 
         if (isNative && owner instanceof DelegatingFacadeContext) {
             // Native methods are only defined in facades and do not need package part implementations
@@ -175,10 +184,10 @@ public class FunctionCodegen {
 
         generateBridges(functionDescriptor);
 
-        boolean staticInCompanionObject = AnnotationsPackage.isPlatformStaticInCompanionObject(functionDescriptor);
+        boolean staticInCompanionObject = AnnotationUtilKt.isPlatformStaticInCompanionObject(functionDescriptor);
         if (staticInCompanionObject) {
             ImplementationBodyCodegen parentBodyCodegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen();
-            parentBodyCodegen.addAdditionalTask(new PlatformStaticGenerator(functionDescriptor, origin, state));
+            parentBodyCodegen.addAdditionalTask(new JvmStaticGenerator(functionDescriptor, origin, state));
         }
 
         if (state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES || isAbstractMethod(functionDescriptor, contextKind)) {
@@ -200,9 +209,9 @@ public class FunctionCodegen {
             generateMethodBody(mv, functionDescriptor, methodContext, jvmSignature, strategy, memberCodegen);
         }
         else if (staticInCompanionObject) {
-            // native platformStatic foo() in companion object should delegate to the static native function moved to the outer class
+            // native @JvmStatic foo() in companion object should delegate to the static native function moved to the outer class
             mv.visitCode();
-            FunctionDescriptor staticFunctionDescriptor = PlatformStaticGenerator.createStaticFunctionDescriptor(functionDescriptor);
+            FunctionDescriptor staticFunctionDescriptor = JvmStaticGenerator.createStaticFunctionDescriptor(functionDescriptor);
             JvmMethodSignature jvmMethodSignature =
                     typeMapper.mapSignature(memberCodegen.getContext().accessibleDescriptor(staticFunctionDescriptor, null));
             Type owningType = typeMapper.mapClass((ClassifierDescriptor) staticFunctionDescriptor.getContainingDeclaration());
@@ -228,6 +237,22 @@ public class FunctionCodegen {
         else {
             annotationCodegen.genAnnotations(functionDescriptor, asmMethod.getReturnType());
         }
+
+        writePackageFacadeMethodAnnotationsIfNeeded(mv);
+    }
+
+    private void writePackageFacadeMethodAnnotationsIfNeeded(MethodVisitor mv) {
+        if (owner instanceof PackageFacadeContext) {
+            PackageFacadeContext packageFacadeContext = (PackageFacadeContext) owner;
+            Type delegateToClassType = packageFacadeContext.getPublicFacadeType();
+            if (delegateToClassType != null) {
+                String className = delegateToClassType.getClassName();
+                AnnotationVisitor
+                        av = mv.visitAnnotation(AsmUtil.asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_DELEGATED_METHOD), true);
+                av.visit(JvmAnnotationNames.IMPLEMENTATION_CLASS_NAME_FIELD_NAME, className);
+                av.visitEnd();
+            }
+        }
     }
 
     private void generateParameterAnnotations(
@@ -248,7 +273,9 @@ public class FunctionCodegen {
 
             if (kind == JvmMethodParameterKind.VALUE) {
                 ValueParameterDescriptor parameter = iterator.next();
-                v.getSerializationBindings().put(INDEX_FOR_VALUE_PARAMETER, parameter, i);
+                if (parameter.getIndex() != i) {
+                    v.getSerializationBindings().put(INDEX_FOR_VALUE_PARAMETER, parameter, i);
+                }
                 AnnotationCodegen annotationCodegen = AnnotationCodegen.forParameter(i, mv, typeMapper);
 
                 if (functionDescriptor instanceof PropertySetterDescriptor) {
@@ -305,8 +332,7 @@ public class FunctionCodegen {
         }
         else if (isFunctionLiteral(functionDescriptor) ||
                  isLocalFunction(functionDescriptor) ||
-                 isFunctionExpression(functionDescriptor)
-                ) {
+                 isFunctionExpression(functionDescriptor)) {
             return typeMapper.mapType(context.getThisDescriptor());
         }
         else {
@@ -330,6 +356,10 @@ public class FunctionCodegen {
         JetTypeMapper typeMapper = parentCodegen.typeMapper;
 
         Label methodEnd;
+
+        int functionFakeIndex = -1;
+        int lambdaFakeIndex = -1;
+
         if (context.getParentContext() instanceof DelegatingFacadeContext) {
             generateFacadeDelegateMethodBody(mv, signature.getAsmMethod(), (DelegatingFacadeContext) context.getParentContext());
             methodEnd = new Label();
@@ -337,6 +367,13 @@ public class FunctionCodegen {
         else {
             FrameMap frameMap = createFrameMap(parentCodegen.state, functionDescriptor, signature, isStaticMethod(context.getContextKind(),
                                                                                                                   functionDescriptor));
+            if (context.isInlineFunction()) {
+                functionFakeIndex = frameMap.enterTemp(Type.INT_TYPE);
+            }
+
+            if (context.isInliningLambda()) {
+                lambdaFakeIndex = frameMap.enterTemp(Type.INT_TYPE);
+            }
 
             Label methodEntry = new Label();
             mv.visitLabel(methodEntry);
@@ -354,6 +391,27 @@ public class FunctionCodegen {
 
         Type thisType = getThisTypeForFunction(functionDescriptor, context, typeMapper);
         generateLocalVariableTable(mv, signature, functionDescriptor, thisType, methodBegin, methodEnd, context.getContextKind());
+
+        if (context.isInlineFunction() && functionFakeIndex != -1) {
+            mv.visitLocalVariable(
+                    JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_FUNCTION + functionDescriptor.getName().asString(),
+                    Type.INT_TYPE.getDescriptor(), null,
+                    methodBegin, methodEnd,
+                    functionFakeIndex);
+        }
+
+        if (context.isInliningLambda() && thisType != null && lambdaFakeIndex != -1) {
+            String name = thisType.getClassName();
+            int indexOfLambdaOrdinal = name.lastIndexOf("$");
+            if (indexOfLambdaOrdinal > 0) {
+                int lambdaOrdinal = Integer.parseInt(name.substring(indexOfLambdaOrdinal + 1));
+                mv.visitLocalVariable(
+                        JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_ARGUMENT + lambdaOrdinal,
+                        Type.INT_TYPE.getDescriptor(), null,
+                        methodBegin, methodEnd,
+                        lambdaFakeIndex);
+            }
+        }
     }
 
     private static void generateLocalVariableTable(
@@ -482,29 +540,65 @@ public class FunctionCodegen {
 
     public void generateBridges(@NotNull FunctionDescriptor descriptor) {
         if (descriptor instanceof ConstructorDescriptor) return;
-        if (owner.getContextKind() == OwnerKind.TRAIT_IMPL) return;
-        if (isTrait(descriptor.getContainingDeclaration())) return;
+        if (owner.getContextKind() == OwnerKind.DEFAULT_IMPLS) return;
+        if (isInterface(descriptor.getContainingDeclaration())) return;
 
         // equals(Any?), hashCode(), toString() never need bridges
         if (isMethodOfAny(descriptor)) return;
 
         // If the function doesn't have a physical declaration among super-functions, it's a SAM adapter or alike and doesn't need bridges
-        if (CallResolverUtilPackage.isOrOverridesSynthesized(descriptor)) return;
+        if (CallResolverUtilKt.isOrOverridesSynthesized(descriptor)) return;
 
-        Set<Bridge<Method>> bridgesToGenerate = BridgesPackage.generateBridgesForFunctionDescriptor(
-                descriptor,
-                new Function1<FunctionDescriptor, Method>() {
-                    @Override
-                    public Method invoke(FunctionDescriptor descriptor) {
-                        return typeMapper.mapSignature(descriptor).getAsmMethod();
+        boolean isSpecial = SpecialBuiltinMembers.getOverriddenBuiltinWithDifferentJvmDescriptor(descriptor) != null;
+
+        Set<Bridge<Method>> bridgesToGenerate;
+        if (!isSpecial) {
+            bridgesToGenerate = ImplKt.generateBridgesForFunctionDescriptor(
+                    descriptor,
+                    new Function1<FunctionDescriptor, Method>() {
+                        @Override
+                        public Method invoke(FunctionDescriptor descriptor) {
+                            return typeMapper.mapSignature(descriptor).getAsmMethod();
+                        }
                     }
-                }
-        );
+            );
+            if (!bridgesToGenerate.isEmpty()) {
+                PsiElement origin = descriptor.getKind() == DECLARATION ? getSourceFromDescriptor(descriptor) : null;
+                boolean isSpecialBridge =
+                        BuiltinMethodsWithSpecialGenericSignature.getOverriddenBuiltinFunctionWithErasedValueParametersInJava(descriptor) != null;
 
-        if (!bridgesToGenerate.isEmpty()) {
-            PsiElement origin = descriptor.getKind() == DECLARATION ? getSourceFromDescriptor(descriptor) : null;
-            for (Bridge<Method> bridge : bridgesToGenerate) {
-                generateBridge(origin, descriptor, bridge.getFrom(), bridge.getTo());
+                for (Bridge<Method> bridge : bridgesToGenerate) {
+                    generateBridge(origin, descriptor, bridge.getFrom(), bridge.getTo(), isSpecialBridge, false);
+                }
+            }
+        }
+        else {
+            Set<BridgeForBuiltinSpecial<Method>> specials = BuiltinSpecialBridgesUtil.generateBridgesForBuiltinSpecial(
+                    descriptor,
+                    new Function1<FunctionDescriptor, Method>() {
+                        @Override
+                        public Method invoke(FunctionDescriptor descriptor) {
+                            return typeMapper.mapSignature(descriptor).getAsmMethod();
+                        }
+                    }
+            );
+
+            if (!specials.isEmpty()) {
+                PsiElement origin = descriptor.getKind() == DECLARATION ? getSourceFromDescriptor(descriptor) : null;
+                for (BridgeForBuiltinSpecial<Method> bridge : specials) {
+                    generateBridge(
+                            origin, descriptor, bridge.getFrom(), bridge.getTo(),
+                            bridge.isSpecial(), bridge.isDelegateToSuper());
+                }
+            }
+
+            if (!descriptor.getKind().isReal() && isAbstractMethod(descriptor, OwnerKind.IMPLEMENTATION)) {
+                CallableDescriptor overridden = SpecialBuiltinMembers.getOverriddenBuiltinWithDifferentJvmDescriptor(descriptor);
+                assert overridden != null;
+
+                Method method = typeMapper.mapSignature(descriptor).getAsmMethod();
+                int flags = ACC_ABSTRACT | getVisibilityAccessFlag(descriptor);
+                v.newMethod(JvmDeclarationOriginKt.OtherOrigin(overridden), flags, method.getName(), method.getDescriptor(), null, null);
             }
         }
     }
@@ -559,13 +653,11 @@ public class FunctionCodegen {
             @NotNull FunctionDescriptor functionDescriptor,
             @NotNull OwnerKind kind,
             @NotNull DefaultParameterValueLoader loadStrategy,
-            @Nullable JetNamedFunction function
+            @Nullable KtNamedFunction function
     ) {
         DeclarationDescriptor contextClass = owner.getContextDescriptor().getContainingDeclaration();
 
-        if (kind != OwnerKind.TRAIT_IMPL &&
-            contextClass instanceof ClassDescriptor &&
-            ((ClassDescriptor) contextClass).getKind() == ClassKind.INTERFACE) {
+        if (kind != OwnerKind.DEFAULT_IMPLS && isInterface(contextClass)) {
             return;
         }
 
@@ -577,7 +669,7 @@ public class FunctionCodegen {
                     getDeprecatedAccessFlag(functionDescriptor) |
                     ACC_SYNTHETIC;
         if (!(functionDescriptor instanceof ConstructorDescriptor)) {
-            flags |= ACC_STATIC;
+            flags |= ACC_STATIC | ACC_BRIDGE;
         }
         // $default methods are never private to be accessible from other class files (e.g. inner) without the need of synthetic accessors
         flags &= ~ACC_PRIVATE;
@@ -585,7 +677,7 @@ public class FunctionCodegen {
         Method defaultMethod = typeMapper.mapDefaultMethod(functionDescriptor, kind);
 
         MethodVisitor mv = v.newMethod(
-                Synthetic(function, functionDescriptor),
+                JvmDeclarationOriginKt.Synthetic(function, functionDescriptor),
                 flags,
                 defaultMethod.getName(),
                 defaultMethod.getDescriptor(), null,
@@ -615,7 +707,7 @@ public class FunctionCodegen {
             @NotNull FunctionDescriptor functionDescriptor,
             @NotNull MethodVisitor mv,
             @NotNull DefaultParameterValueLoader loadStrategy,
-            @Nullable JetNamedFunction function,
+            @Nullable KtNamedFunction function,
             @NotNull MemberCodegen<?> parentCodegen
     ) {
         GenerationState state = parentCodegen.state;
@@ -740,12 +832,15 @@ public class FunctionCodegen {
             @Nullable PsiElement origin,
             @NotNull FunctionDescriptor descriptor,
             @NotNull Method bridge,
-            @NotNull Method delegateTo
+            @NotNull Method delegateTo,
+            boolean isSpecialBridge,
+            boolean isStubDeclarationWithDelegationToSuper
     ) {
-        int flags = ACC_PUBLIC | ACC_BRIDGE | ACC_SYNTHETIC; // TODO.
+        boolean isSpecialOrDelegationToSuper = isSpecialBridge || isStubDeclarationWithDelegationToSuper;
+        int flags = ACC_PUBLIC | ACC_BRIDGE | (!isSpecialOrDelegationToSuper ? ACC_SYNTHETIC : 0) | (isSpecialBridge ? ACC_FINAL : 0); // TODO.
 
         MethodVisitor mv =
-                v.newMethod(DiagnosticsPackage.Bridge(descriptor, origin), flags, bridge.getName(), bridge.getDescriptor(), null, null);
+                v.newMethod(JvmDeclarationOriginKt.Bridge(descriptor, origin), flags, bridge.getName(), bridge.getDescriptor(), null, null);
         if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return;
 
         mv.visitCode();
@@ -754,7 +849,9 @@ public class FunctionCodegen {
         Type[] originalArgTypes = delegateTo.getArgumentTypes();
 
         InstructionAdapter iv = new InstructionAdapter(mv);
-        ImplementationBodyCodegen.markLineNumberForSyntheticFunction(owner.getThisDescriptor(), iv);
+        MemberCodegen.markLineNumberForSyntheticFunction(owner.getThisDescriptor(), iv);
+
+        generateInstanceOfBarrierIfNeeded(iv, descriptor, bridge, delegateTo);
 
         iv.load(0, OBJECT_TYPE);
         for (int i = 0, reg = 1; i < argTypes.length; i++) {
@@ -763,7 +860,15 @@ public class FunctionCodegen {
             reg += argTypes[i].getSize();
         }
 
-        iv.invokevirtual(v.getThisName(), delegateTo.getName(), delegateTo.getDescriptor());
+        if (isStubDeclarationWithDelegationToSuper) {
+            ClassDescriptor parentClass = getSuperClassDescriptor((ClassDescriptor) descriptor.getContainingDeclaration());
+            assert parentClass != null;
+            String parentInternalName = typeMapper.mapClass(parentClass).getInternalName();
+            iv.invokespecial(parentInternalName, delegateTo.getName(), delegateTo.getDescriptor());
+        }
+        else {
+            iv.invokevirtual(v.getThisName(), delegateTo.getName(), delegateTo.getDescriptor());
+        }
 
         StackValue.coerce(delegateTo.getReturnType(), bridge.getReturnType(), iv);
         iv.areturn(bridge.getReturnType());
@@ -771,6 +876,62 @@ public class FunctionCodegen {
         endVisit(mv, "bridge method", origin);
     }
 
+    private static void generateInstanceOfBarrierIfNeeded(
+            @NotNull InstructionAdapter iv,
+            @NotNull FunctionDescriptor descriptor,
+            @NotNull Method bridge,
+            @NotNull Method delegateTo
+    ) {
+        if (BuiltinMethodsWithSpecialGenericSignature.getOverriddenBuiltinFunctionWithErasedValueParametersInJava(descriptor) == null) return;
+
+        assert descriptor.getValueParameters().size() == 1 : "Should be descriptor with one value parameter, but found: " + descriptor;
+
+        if (bridge.getArgumentTypes()[0].getSort() != Type.OBJECT) return;
+
+        iv.load(1, OBJECT_TYPE);
+
+        KotlinType jetType = descriptor.getValueParameters().get(0).getType();
+
+        // TODO: reuse logic from ExpressionCodegen
+        if (jetType.isMarkedNullable()) {
+            Label nope = new Label();
+            Label end = new Label();
+
+            iv.dup();
+            iv.ifnull(nope);
+            TypeIntrinsics.instanceOf(
+                    iv,
+                    jetType,
+                    boxType(delegateTo.getArgumentTypes()[0])
+            );
+            iv.goTo(end);
+            iv.mark(nope);
+            iv.pop();
+            iv.iconst(1);
+            iv.mark(end);
+        }
+        else {
+            TypeIntrinsics.instanceOf(
+                    iv,
+                    jetType,
+                    boxType(delegateTo.getArgumentTypes()[0])
+            );
+        }
+
+        Label afterBarrier = new Label();
+
+        iv.ifne(afterBarrier);
+
+        String shortName = getFqName(descriptor).shortName().asString();
+        StackValue returnValue =
+                ("indexOf".equals(shortName) || "lastIndexOf".equals(shortName)) ? StackValue.constant(-1, Type.INT_TYPE) : StackValue.none();
+
+        returnValue.put(bridge.getReturnType(), iv);
+        iv.areturn(bridge.getReturnType());
+
+        iv.visitLabel(afterBarrier);
+    }
+
     public void genDelegate(@NotNull FunctionDescriptor functionDescriptor, FunctionDescriptor overriddenDescriptor, StackValue field) {
         genDelegate(functionDescriptor, overriddenDescriptor.getOriginal(),
                     (ClassDescriptor) overriddenDescriptor.getContainingDeclaration(), field);
@@ -783,7 +944,7 @@ public class FunctionCodegen {
             final StackValue field
     ) {
         generateMethod(
-                Delegation(DescriptorToSourceUtils.descriptorToDeclaration(delegatedTo), delegateFunction), delegateFunction,
+                JvmDeclarationOriginKt.Delegation(DescriptorToSourceUtils.descriptorToDeclaration(delegatedTo), delegateFunction), delegateFunction,
                 new FunctionGenerationStrategy() {
                     @Override
                     public void generateBody(

compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java

@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.codegen.context.MethodContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.descriptors.CallableDescriptor;
-import org.jetbrains.kotlin.psi.JetDeclarationWithBody;
+import org.jetbrains.kotlin.psi.KtDeclarationWithBody;
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 
@@ -34,12 +34,12 @@ public abstract class FunctionGenerationStrategy {
     );
 
     public static class FunctionDefault extends CodegenBased<CallableDescriptor> {
-        private final JetDeclarationWithBody declaration;
+        private final KtDeclarationWithBody declaration;
 
         public FunctionDefault(
                 @NotNull GenerationState state,
                 @NotNull CallableDescriptor descriptor,
-                @NotNull JetDeclarationWithBody declaration
+                @NotNull KtDeclarationWithBody declaration
         ) {
             super(state, descriptor);
             this.declaration = declaration;

compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java

@@ -16,15 +16,12 @@
 
 package org.jetbrains.kotlin.codegen;
 
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.descriptors.*;
-import org.jetbrains.kotlin.psi.Call;
-import org.jetbrains.kotlin.psi.JetCallExpression;
-import org.jetbrains.kotlin.psi.JetExpression;
-import org.jetbrains.kotlin.psi.ValueArgument;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.calls.model.DelegatingResolvedCall;
 import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument;
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
@@ -36,11 +33,8 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
-import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 import static org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER;
 
 public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrategy.CodegenBased<FunctionDescriptor> {
@@ -67,7 +61,7 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat
          every argument boils down to calling LOAD with the corresponding index
          */
 
-        JetCallExpression fakeExpression = constructFakeFunctionCall();
+        KtCallExpression fakeExpression = constructFakeFunctionCall();
         final List<? extends ValueArgument> fakeArguments = fakeExpression.getValueArguments();
 
         final ReceiverValue dispatchReceiver = computeAndSaveReceiver(signature, codegen, referencedFunction.getDispatchReceiverParameter());
@@ -75,6 +69,18 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat
         computeAndSaveArguments(fakeArguments, codegen);
 
         ResolvedCall<CallableDescriptor> fakeResolvedCall = new DelegatingResolvedCall<CallableDescriptor>(resolvedCall) {
+
+            private final Map<ValueParameterDescriptor, ResolvedValueArgument> argumentMap;
+            {
+                argumentMap = new LinkedHashMap<ValueParameterDescriptor, ResolvedValueArgument>(fakeArguments.size());
+                int index = 0;
+                List<ValueParameterDescriptor> parameters = callableDescriptor.getValueParameters();
+                for (ValueArgument argument : fakeArguments) {
+                    argumentMap.put(parameters.get(index), new ExpressionValueArgument(argument));
+                    index++;
+                }
+            }
+
             @NotNull
             @Override
             public ReceiverValue getExtensionReceiver() {
@@ -90,11 +96,13 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat
             @NotNull
             @Override
             public List<ResolvedValueArgument> getValueArgumentsByIndex() {
-                List<ResolvedValueArgument> result = new ArrayList<ResolvedValueArgument>(fakeArguments.size());
-                for (ValueArgument argument : fakeArguments) {
-                    result.add(new ExpressionValueArgument(argument));
-                }
-                return result;
+                return new ArrayList<ResolvedValueArgument>(argumentMap.values());
+            }
+
+            @NotNull
+            @Override
+            public Map<ValueParameterDescriptor, ResolvedValueArgument> getValueArguments() {
+                return argumentMap;
             }
         };
 
@@ -120,7 +128,7 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat
     }
 
     @NotNull
-    private JetCallExpression constructFakeFunctionCall() {
+    private KtCallExpression constructFakeFunctionCall() {
         StringBuilder fakeFunctionCall = new StringBuilder("callableReferenceFakeCall(");
         for (Iterator<ValueParameterDescriptor> iterator = referencedFunction.getValueParameters().iterator(); iterator.hasNext(); ) {
             ValueParameterDescriptor descriptor = iterator.next();
@@ -130,14 +138,14 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat
             }
         }
         fakeFunctionCall.append(")");
-        return (JetCallExpression) JetPsiFactory(state.getProject()).createExpression(fakeFunctionCall.toString());
+        return (KtCallExpression) KtPsiFactoryKt.KtPsiFactory(state.getProject()).createExpression(fakeFunctionCall.toString());
     }
 
     private void computeAndSaveArguments(@NotNull List<? extends ValueArgument> fakeArguments, @NotNull ExpressionCodegen codegen) {
         int receivers = (referencedFunction.getDispatchReceiverParameter() != null ? 1 : 0) +
                         (referencedFunction.getExtensionReceiverParameter() != null ? 1 : 0);
 
-        List<ValueParameterDescriptor> parameters = KotlinPackage.drop(callableDescriptor.getValueParameters(), receivers);
+        List<ValueParameterDescriptor> parameters = CollectionsKt.drop(callableDescriptor.getValueParameters(), receivers);
         for (int i = 0; i < parameters.size(); i++) {
             ValueParameterDescriptor parameter = parameters.get(i);
             ValueArgument fakeArgument = fakeArguments.get(i);
@@ -156,7 +164,8 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat
     ) {
         if (receiver == null) return NO_RECEIVER;
 
-        JetExpression receiverExpression = JetPsiFactory(state.getProject()).createExpression("callableReferenceFakeReceiver");
+        KtExpression receiverExpression = KtPsiFactoryKt
+                .KtPsiFactory(state.getProject()).createExpression("callableReferenceFakeReceiver");
         codegen.tempVariables.put(receiverExpression, receiverParameterStackValue(signature));
         return new ExpressionReceiver(receiverExpression, receiver.getType());
     }

compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt

@@ -0,0 +1,190 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import com.intellij.util.ArrayUtil
+import org.jetbrains.kotlin.backend.common.bridges.findImplementationFromInterface
+import org.jetbrains.kotlin.backend.common.bridges.firstSuperMethodFromKotlin
+import org.jetbrains.kotlin.codegen.context.ClassContext
+import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
+import org.jetbrains.kotlin.load.java.JvmAbi
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KOTLIN_INTERFACE_DEFAULT_IMPLS
+import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
+import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.DelegationToTraitImpl
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
+import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
+import org.jetbrains.kotlin.resolve.scopes.MemberScope
+import org.jetbrains.org.objectweb.asm.MethodVisitor
+import org.jetbrains.org.objectweb.asm.Opcodes.*
+import java.util.*
+
+public class InterfaceImplBodyCodegen(
+        aClass: KtClassOrObject,
+        context: ClassContext,
+        v: ClassBuilder,
+        state: GenerationState,
+        parentCodegen: MemberCodegen<*>?
+) : ClassBodyCodegen(aClass, context, InterfaceImplBodyCodegen.InterfaceImplClassBuilder(v), state, parentCodegen) {
+    private var isAnythingGenerated: Boolean = false
+        get() = (v as InterfaceImplClassBuilder).isAnythingGenerated
+
+    override fun generateDeclaration() {
+        v.defineClass(
+                myClass, V1_6, ACC_PUBLIC or ACC_FINAL,
+                typeMapper.mapDefaultImpls(descriptor).internalName,
+                null, "java/lang/Object", ArrayUtil.EMPTY_STRING_ARRAY
+        )
+        v.visitSource(myClass.getContainingFile().getName(), null)
+    }
+
+    override fun classForInnerClassRecord(): ClassDescriptor? {
+        if (!isAnythingGenerated) return null
+        if (DescriptorUtils.isLocal(descriptor)) return null
+        val classDescriptorImpl = ClassDescriptorImpl(
+                descriptor, Name.identifier(JvmAbi.DEFAULT_IMPLS_CLASS_NAME),
+                Modality.FINAL, Collections.emptyList(), SourceElement.NO_SOURCE)
+
+        classDescriptorImpl.initialize(MemberScope.Empty, emptySet(), null)
+        return classDescriptorImpl
+    }
+
+    override fun generateSyntheticParts() {
+        for (memberDescriptor in descriptor.getDefaultType().getMemberScope().getContributedDescriptors()) {
+            if (memberDescriptor !is CallableMemberDescriptor) continue
+
+            if (memberDescriptor.getKind().isReal()) continue
+            if (memberDescriptor.getVisibility() == Visibilities.INVISIBLE_FAKE) continue
+            if (memberDescriptor.getModality() == Modality.ABSTRACT) continue
+
+            val implementation = findImplementationFromInterface(memberDescriptor) ?: continue
+
+            // If implementation is located in a Java interface, it will be inherited via normal Java rules
+            if (implementation is JavaMethodDescriptor) continue
+
+            // We create a copy of the function with kind = DECLARATION so that FunctionCodegen will generate its body
+            val copy = memberDescriptor.copy(memberDescriptor.getContainingDeclaration(), Modality.OPEN, memberDescriptor.getVisibility(),
+                                             CallableMemberDescriptor.Kind.DECLARATION, true)
+
+            if (memberDescriptor is FunctionDescriptor) {
+                generateDelegationToSuperTraitImpl(copy as FunctionDescriptor, implementation as FunctionDescriptor)
+            }
+            else if (memberDescriptor is PropertyDescriptor) {
+                implementation as PropertyDescriptor
+                val getter = (copy as PropertyDescriptor).getGetter()
+                val implGetter = implementation.getGetter()
+                if (getter != null && implGetter != null) {
+                    generateDelegationToSuperTraitImpl(getter, implGetter)
+                }
+                val setter = copy.getSetter()
+                val implSetter = implementation.getSetter()
+                if (setter != null && implSetter != null) {
+                    generateDelegationToSuperTraitImpl(setter, implSetter)
+                }
+            }
+        }
+    }
+
+    private fun generateDelegationToSuperTraitImpl(descriptor: FunctionDescriptor, implementation: FunctionDescriptor) {
+        val delegateTo = firstSuperMethodFromKotlin(descriptor, implementation) as FunctionDescriptor? ?: return
+
+        // We can't call super methods from Java 1.8 interfaces because that requires INVOKESPECIAL which is forbidden from TImpl class
+        if (delegateTo is JavaMethodDescriptor) return
+
+        functionCodegen.generateMethod(
+                DelegationToTraitImpl(DescriptorToSourceUtils.descriptorToDeclaration(descriptor), descriptor),
+                descriptor,
+                object : FunctionGenerationStrategy.CodegenBased<FunctionDescriptor>(state, descriptor) {
+                    override fun doGenerateBody(codegen: ExpressionCodegen, signature: JvmMethodSignature) {
+                        val iv = codegen.v
+
+                        val method = typeMapper.mapToCallableMethod(delegateTo, true)
+                        val myParameters = signature.getValueParameters()
+                        val calleeParameters = method.getValueParameters()
+
+                        if (myParameters.size() != calleeParameters.size()) {
+                            throw AssertionError(
+                                    "Method from super interface has a different signature.\n" +
+                                    "This method:\n%s\n%s\n%s\nSuper method:\n%s\n%s\n%s".format(
+                                            callableDescriptor, signature, myParameters, delegateTo, method, calleeParameters
+                                    )
+                            )
+                        }
+
+                        var k = 0
+                        val it = calleeParameters.iterator()
+                        for (parameter in myParameters) {
+                            val type = parameter.getAsmType()
+                            StackValue.local(k, type).put(it.next().getAsmType(), iv)
+                            k += type.getSize()
+                        }
+
+                        method.genInvokeInstruction(iv)
+                        StackValue.coerce(method.returnType, signature.getReturnType(), iv)
+                        iv.areturn(signature.getReturnType())
+                    }
+                })
+    }
+
+    override fun generateKotlinAnnotation() {
+        (v as InterfaceImplClassBuilder).stopCounting()
+
+        val av = v.newAnnotation(AsmUtil.asmDescByFqNameWithoutInnerClasses(KOTLIN_INTERFACE_DEFAULT_IMPLS), true)
+        av.visit(JvmAnnotationNames.VERSION_FIELD_NAME, JvmAbi.VERSION.toArray())
+        av.visitEnd()
+        AsmUtil.writeKotlinSyntheticClassAnnotation(v, state)
+    }
+
+    override fun done() {
+        super.done()
+        if (!isAnythingGenerated) {
+            state.factory.removeClasses(setOf(typeMapper.mapDefaultImpls(descriptor).internalName))
+        }
+    }
+
+    private class InterfaceImplClassBuilder(private val v: ClassBuilder) : DelegatingClassBuilder() {
+        private var shouldCount: Boolean = true
+        var isAnythingGenerated: Boolean = false
+            private set
+
+        fun stopCounting() {
+            shouldCount = false
+        }
+
+        override fun getDelegate() = v
+
+        override fun newMethod(
+                origin: JvmDeclarationOrigin,
+                access: Int,
+                name: String,
+                desc: String,
+                signature: String?,
+                exceptions: Array<out String>?
+        ): MethodVisitor {
+            if (shouldCount) {
+                isAnythingGenerated = true
+            }
+            return super.newMethod(origin, access, name, desc, signature, exceptions)
+        }
+    }
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java

@@ -16,39 +16,34 @@
 
 package org.jetbrains.kotlin.codegen;
 
-import com.intellij.openapi.vfs.StandardFileSystems;
-import com.intellij.openapi.vfs.VfsUtilCore;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
-import kotlin.KotlinPackage;
+import com.intellij.psi.PsiFile;
+import kotlin.CollectionsKt;
+import kotlin.StringsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
 import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.FacadePartWithSourceFile;
 import org.jetbrains.kotlin.codegen.context.MethodContext;
-import org.jetbrains.kotlin.codegen.context.PackageContext;
 import org.jetbrains.kotlin.codegen.context.RootContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
-import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor;
-import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment;
-import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass;
-import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement;
 import org.jetbrains.kotlin.load.kotlin.ModuleMapping;
-import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass;
-import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider;
-import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.kotlin.psi.JetFunction;
-import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilPackage;
+import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityUtilsKt;
+import org.jetbrains.kotlin.psi.KtFile;
+import org.jetbrains.kotlin.psi.KtFunction;
+import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilKt;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.inline.InlineUtil;
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor;
-import org.jetbrains.kotlin.types.JetType;
+import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
 
 import java.io.File;
@@ -61,7 +56,7 @@ public class JvmCodegenUtil {
     private JvmCodegenUtil() {
     }
 
-    public static boolean isInterface(DeclarationDescriptor descriptor) {
+    public static boolean isJvmInterface(DeclarationDescriptor descriptor) {
         if (descriptor instanceof ClassDescriptor) {
             ClassKind kind = ((ClassDescriptor) descriptor).getKind();
             return kind == ClassKind.INTERFACE || kind == ClassKind.ANNOTATION_CLASS;
@@ -69,8 +64,8 @@ public class JvmCodegenUtil {
         return false;
     }
 
-    public static boolean isInterface(JetType type) {
-        return isInterface(type.getConstructor().getDeclarationDescriptor());
+    public static boolean isJvmInterface(KotlinType type) {
+        return isJvmInterface(type.getConstructor().getDeclarationDescriptor());
     }
 
     public static boolean isConst(@NotNull CalculatedClosure closure) {
@@ -85,25 +80,21 @@ public class JvmCodegenUtil {
 
         return !isFakeOverride && !isDelegate &&
                (((context.hasThisDescriptor() && containingDeclaration == context.getThisDescriptor()) ||
-                 (context.getParentContext() instanceof PackageContext
-                  && isSamePackageInSameModule(context.getParentContext().getContextDescriptor(), containingDeclaration)))
-                && context.getContextKind() != OwnerKind.TRAIT_IMPL);
+                 ((context.getParentContext() instanceof FacadePartWithSourceFile)
+                  && isWithinSameFile(((FacadePartWithSourceFile) context.getParentContext()).getSourceFile(), descriptor)))
+                && context.getContextKind() != OwnerKind.DEFAULT_IMPLS);
     }
 
-    private static boolean isSamePackageInSameModule(
-            @NotNull DeclarationDescriptor callerOwner,
-            @NotNull DeclarationDescriptor calleeOwner
+    private static boolean isWithinSameFile(
+            @Nullable KtFile callerFile,
+            @NotNull CallableMemberDescriptor descriptor
     ) {
-        if (callerOwner instanceof PackageFragmentDescriptor && calleeOwner instanceof PackageFragmentDescriptor) {
-            PackageFragmentDescriptor callerFragment = (PackageFragmentDescriptor) callerOwner;
-            PackageFragmentDescriptor calleeFragment = (PackageFragmentDescriptor) calleeOwner;
+        DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration().getOriginal();
+        if (containingDeclaration instanceof PackageFragmentDescriptor) {
+            PsiElement calleeElement = DescriptorToSourceUtils.descriptorToDeclaration(descriptor);
+            PsiFile calleeFile = calleeElement != null ? calleeElement.getContainingFile() : null;
+            return callerFile != null && callerFile != SourceFile.NO_SOURCE_FILE && calleeFile == callerFile;
 
-            // backing field should be used directly within same module of same package
-            if (callerFragment == calleeFragment) {
-                return true;
-            }
-            return callerFragment.getFqName().equals(calleeFragment.getFqName())
-                   && calleeFragment instanceof IncrementalPackageFragmentProvider.IncrementalPackageFragment;
         }
         return false;
     }
@@ -120,47 +111,15 @@ public class JvmCodegenUtil {
 
         CallableMemberDescriptor directMember = getDirectMember(declarationDescriptor);
         if (directMember instanceof DeserializedCallableMemberDescriptor) {
-            return isContainedByCompiledPartOfOurModule(((DeserializedCallableMemberDescriptor) directMember), outDirectory);
+            return ModuleVisibilityUtilsKt.isContainedByCompiledPartOfOurModule(directMember, outDirectory);
         }
         else {
             return DescriptorUtils.areInSameModule(directMember, contextDescriptor);
         }
     }
 
-    private static boolean isContainedByCompiledPartOfOurModule(
-            @NotNull DeserializedCallableMemberDescriptor descriptor,
-            @Nullable File outDirectory
-    ) {
-        DeclarationDescriptor packageFragment = descriptor.getContainingDeclaration();
-        if (packageFragment instanceof IncrementalPackageFragmentProvider.IncrementalPackageFragment) {
-            return true;
-        }
-
-        if (outDirectory == null) {
-            return false;
-        }
-
-        if (!(packageFragment instanceof LazyJavaPackageFragment)) {
-            return false;
-        }
-
-        SourceElement source = ((LazyJavaPackageFragment) packageFragment).getSource();
-        if (source instanceof KotlinJvmBinarySourceElement) {
-            KotlinJvmBinaryClass binaryClass = ((KotlinJvmBinarySourceElement) source).getBinaryClass();
-            if (binaryClass instanceof VirtualFileKotlinClass) {
-                VirtualFile file = ((VirtualFileKotlinClass) binaryClass).getFile();
-                if (file.getFileSystem().getProtocol() == StandardFileSystems.FILE_PROTOCOL) {
-                    File ioFile = VfsUtilCore.virtualToIoFile(file);
-                    return ioFile.getAbsolutePath().startsWith(outDirectory.getAbsolutePath() + File.separator);
-                }
-            }
-        }
-
-        return false;
-    }
-
     public static boolean hasAbstractMembers(@NotNull ClassDescriptor classDescriptor) {
-        return KotlinPackage.any(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors(),
+        return CollectionsKt.any(DescriptorUtils.getAllDescriptors(classDescriptor.getDefaultType().getMemberScope()),
                                  new Function1<DeclarationDescriptor, Boolean>() {
                                      @Override
                                      public Boolean invoke(DeclarationDescriptor descriptor) {
@@ -180,8 +139,7 @@ public class JvmCodegenUtil {
         if (JetTypeMapper.isAccessor(property)) return false;
 
         // Inline functions can't use direct access because a field may not be visible at the call site
-        if (context.isInlineFunction() &&
-            (!Visibilities.isPrivate(property.getVisibility()) || DescriptorUtils.isTopLevelDeclaration(property))) {
+        if (context.isInlineFunction()) {
             return false;
         }
 
@@ -207,8 +165,8 @@ public class JvmCodegenUtil {
     }
 
     private static boolean isDebuggerContext(@NotNull MethodContext context) {
-        JetFile file = DescriptorToSourceUtils.getContainingFile(context.getContextDescriptor());
-        return file != null && CodeFragmentUtilPackage.getSuppressDiagnosticsInDebugMode(file);
+        KtFile file = DescriptorToSourceUtils.getContainingFile(context.getContextDescriptor());
+        return file != null && CodeFragmentUtilKt.getSuppressDiagnosticsInDebugMode(file);
     }
 
     @Nullable
@@ -245,19 +203,12 @@ public class JvmCodegenUtil {
     public static boolean isArgumentWhichWillBeInlined(@NotNull BindingContext bindingContext, @NotNull DeclarationDescriptor descriptor) {
         PsiElement declaration = DescriptorToSourceUtils.descriptorToDeclaration(descriptor);
         return InlineUtil.canBeInlineArgument(declaration) &&
-               InlineUtil.isInlinedArgument((JetFunction) declaration, bindingContext, false);
-    }
-
-    public static boolean shouldUseJavaClassForClassLiteral(@NotNull ClassifierDescriptor descriptor) {
-        ModuleDescriptor module = DescriptorUtils.getContainingModule(descriptor);
-        return descriptor instanceof JavaClassDescriptor ||
-               module == module.getBuiltIns().getBuiltInsModule() ||
-               DescriptorUtils.isAnnotationClass(descriptor);
+               InlineUtil.isInlinedArgument((KtFunction) declaration, bindingContext, false);
     }
 
     @NotNull
     public static String getModuleName(ModuleDescriptor module) {
-        return KotlinPackage.removeSurrounding(module.getName().asString(), "<", ">");
+        return StringsKt.removeSurrounding(module.getName().asString(), "<", ">");
     }
 
     @NotNull
@@ -269,6 +220,13 @@ public class JvmCodegenUtil {
         av.visit(JvmAnnotationNames.VERSION_FIELD_NAME, JvmAbi.VERSION.toArray());
 
         // TODO: drop after some time
-        av.visit(JvmAnnotationNames.OLD_ABI_VERSION_FIELD_NAME, JvmAbi.VERSION.getMinor());
+        av.visit(JvmAnnotationNames.OLD_ABI_VERSION_FIELD_NAME, 32);
+    }
+
+    public static void writeModuleName(@NotNull AnnotationVisitor av, @NotNull GenerationState state) {
+        String name = state.getModuleName();
+        if (!name.equals(JvmAbi.DEFAULT_MODULE_NAME)) {
+            av.visit(JvmAnnotationNames.MODULE_NAME_FIELD_NAME, name);
+        }
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java

@@ -23,15 +23,15 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
 import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM;
+import org.jetbrains.kotlin.resolve.TargetPlatformKt;
+import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.kotlin.storage.LockBasedStorageManager;
-import org.jetbrains.kotlin.types.JetType;
+import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils;
 
 import java.util.*;
 
-import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns;
-
 public class JvmRuntimeTypes {
     private final ClassDescriptor lambda;
     private final ClassDescriptor functionReference;
@@ -39,10 +39,10 @@ public class JvmRuntimeTypes {
     private final List<ClassDescriptor> mutablePropertyReferences;
 
     public JvmRuntimeTypes() {
-        ModuleDescriptorImpl module = new ModuleDescriptorImpl(
+        ModuleDescriptorImpl module = TargetPlatformKt.createModule(
+                JvmPlatform.INSTANCE$,
                 Name.special("<jvm functions impl>"),
-                LockBasedStorageManager.NO_LOCKS,
-                TopDownAnalyzerFacadeForJVM.JVM_MODULE_PARAMETERS
+                LockBasedStorageManager.NO_LOCKS
         );
         PackageFragmentDescriptor kotlinJvmInternal = new MutablePackageFragmentDescriptor(module, new FqName("kotlin.jvm.internal"));
 
@@ -72,12 +72,12 @@ public class JvmRuntimeTypes {
     }
 
     @NotNull
-    public Collection<JetType> getSupertypesForClosure(@NotNull FunctionDescriptor descriptor) {
+    public Collection<KotlinType> getSupertypesForClosure(@NotNull FunctionDescriptor descriptor) {
         ReceiverParameterDescriptor receiverParameter = descriptor.getExtensionReceiverParameter();
 
         //noinspection ConstantConditions
-        JetType functionType = getBuiltIns(descriptor).getFunctionType(
-                Annotations.EMPTY,
+        KotlinType functionType = DescriptorUtilsKt.getBuiltIns(descriptor).getFunctionType(
+                Annotations.Companion.getEMPTY(),
                 receiverParameter == null ? null : receiverParameter.getType(),
                 ExpressionTypingUtils.getValueParametersTypes(descriptor.getValueParameters()),
                 descriptor.getReturnType()
@@ -87,16 +87,16 @@ public class JvmRuntimeTypes {
     }
 
     @NotNull
-    public Collection<JetType> getSupertypesForFunctionReference(@NotNull FunctionDescriptor descriptor) {
+    public Collection<KotlinType> getSupertypesForFunctionReference(@NotNull FunctionDescriptor descriptor) {
         ReceiverParameterDescriptor extensionReceiver = descriptor.getExtensionReceiverParameter();
         ReceiverParameterDescriptor dispatchReceiver = descriptor.getDispatchReceiverParameter();
 
-        JetType receiverType =
+        KotlinType receiverType =
                 extensionReceiver != null ? extensionReceiver.getType() : dispatchReceiver != null ? dispatchReceiver.getType() : null;
 
         //noinspection ConstantConditions
-        JetType functionType = getBuiltIns(descriptor).getFunctionType(
-                Annotations.EMPTY,
+        KotlinType functionType = DescriptorUtilsKt.getBuiltIns(descriptor).getFunctionType(
+                Annotations.Companion.getEMPTY(),
                 receiverType,
                 ExpressionTypingUtils.getValueParametersTypes(descriptor.getValueParameters()),
                 descriptor.getReturnType()
@@ -106,7 +106,7 @@ public class JvmRuntimeTypes {
     }
 
     @NotNull
-    public JetType getSupertypeForPropertyReference(@NotNull PropertyDescriptor descriptor) {
+    public KotlinType getSupertypeForPropertyReference(@NotNull PropertyDescriptor descriptor) {
         int arity = (descriptor.getExtensionReceiverParameter() != null ? 1 : 0) +
                     (descriptor.getDispatchReceiverParameter() != null ? 1 : 0);
         return (descriptor.isVar() ? mutablePropertyReferences : propertyReferences).get(arity).getDefaultType();

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java

@@ -1,314 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.codegen;
-
-import com.intellij.openapi.util.Pair;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
-import org.jetbrains.kotlin.descriptors.*;
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor;
-import org.jetbrains.kotlin.load.java.lazy.types.RawTypeCapabilities;
-import org.jetbrains.kotlin.load.kotlin.SignatureDeserializer;
-import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.serialization.AnnotationSerializer;
-import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.kotlin.serialization.SerializerExtension;
-import org.jetbrains.kotlin.serialization.StringTable;
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor;
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor;
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
-import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.org.objectweb.asm.Type;
-import org.jetbrains.org.objectweb.asm.commons.Method;
-
-import java.util.Arrays;
-
-import static org.jetbrains.kotlin.codegen.AsmUtil.shortNameByAsmType;
-import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*;
-
-public class JvmSerializerExtension extends SerializerExtension {
-    private final JvmSerializationBindings bindings;
-    private final JetTypeMapper typeMapper;
-    private final AnnotationSerializer annotationSerializer = new AnnotationSerializer();
-
-    public JvmSerializerExtension(@NotNull JvmSerializationBindings bindings, @NotNull JetTypeMapper typeMapper) {
-        this.bindings = bindings;
-        this.typeMapper = typeMapper;
-    }
-
-    @Override
-    public void serializeClass(@NotNull ClassDescriptor descriptor, @NotNull ProtoBuf.Class.Builder proto, @NotNull StringTable stringTable) {
-        AnnotationDescriptor annotation = descriptor.getAnnotations().findAnnotation(KotlinBuiltIns.FQ_NAMES.annotation);
-        if (annotation != null) {
-            proto.addExtension(JvmProtoBuf.classAnnotation, annotationSerializer.serializeAnnotation(annotation, stringTable));
-        }
-    }
-
-    @Override
-    public void serializeCallable(
-            @NotNull CallableMemberDescriptor callable,
-            @NotNull ProtoBuf.Callable.Builder proto,
-            @NotNull StringTable stringTable
-    ) {
-        saveSignature(callable, proto, stringTable);
-        saveImplClassName(callable, proto, stringTable);
-    }
-
-    @Override
-    public void serializeValueParameter(
-            @NotNull ValueParameterDescriptor descriptor,
-            @NotNull ProtoBuf.Callable.ValueParameter.Builder proto,
-            @NotNull StringTable stringTable
-    ) {
-        Integer index = bindings.get(INDEX_FOR_VALUE_PARAMETER, descriptor);
-        if (index != null) {
-            proto.setExtension(JvmProtoBuf.index, index);
-        }
-    }
-
-    @Override
-    public void serializeType(@NotNull JetType type, @NotNull ProtoBuf.Type.Builder proto, @NotNull StringTable stringTable) {
-        // TODO: don't store type annotations in our binary metadata on Java 8, use *TypeAnnotations attributes instead
-        for (AnnotationDescriptor annotation : type.getAnnotations()) {
-            proto.addExtension(JvmProtoBuf.typeAnnotation, annotationSerializer.serializeAnnotation(annotation, stringTable));
-        }
-
-        if (type.getCapabilities() instanceof RawTypeCapabilities) {
-            proto.setExtension(JvmProtoBuf.isRaw, true);
-        }
-    }
-
-    @Override
-    @NotNull
-    public String getLocalClassName(@NotNull ClassDescriptor descriptor) {
-        return shortNameByAsmType(typeMapper.mapClass(descriptor));
-    }
-
-    private void saveSignature(
-            @NotNull CallableMemberDescriptor callable,
-            @NotNull ProtoBuf.Callable.Builder proto,
-            @NotNull StringTable stringTable
-    ) {
-        SignatureSerializer signatureSerializer = new SignatureSerializer(stringTable);
-        if (callable instanceof FunctionDescriptor) {
-            JvmProtoBuf.JvmMethodSignature signature;
-            if (callable instanceof DeserializedSimpleFunctionDescriptor) {
-                DeserializedSimpleFunctionDescriptor deserialized = (DeserializedSimpleFunctionDescriptor) callable;
-                signature = signatureSerializer.copyMethodSignature(
-                        deserialized.getProto().getExtension(JvmProtoBuf.methodSignature), deserialized.getNameResolver());
-            }
-            else {
-                Method method = bindings.get(METHOD_FOR_FUNCTION, (FunctionDescriptor) callable);
-                signature = method != null ? signatureSerializer.methodSignature(method) : null;
-            }
-            if (signature != null) {
-                proto.setExtension(JvmProtoBuf.methodSignature, signature);
-            }
-        }
-        else if (callable instanceof PropertyDescriptor) {
-            PropertyDescriptor property = (PropertyDescriptor) callable;
-
-            PropertyGetterDescriptor getter = property.getGetter();
-            PropertySetterDescriptor setter = property.getSetter();
-            Method getterMethod = getter == null ? null : bindings.get(METHOD_FOR_FUNCTION, getter);
-            Method setterMethod = setter == null ? null : bindings.get(METHOD_FOR_FUNCTION, setter);
-
-            Pair<Type, String> field = bindings.get(FIELD_FOR_PROPERTY, property);
-            Type fieldType;
-            String fieldName;
-            boolean isStaticInOuter;
-            Method syntheticMethod;
-            if (field != null) {
-                fieldType = field.first;
-                fieldName = field.second;
-                isStaticInOuter = bindings.get(STATIC_FIELD_IN_OUTER_CLASS, property);
-                syntheticMethod = bindings.get(SYNTHETIC_METHOD_FOR_PROPERTY, property);
-            }
-            else {
-                fieldType = null;
-                fieldName = null;
-                isStaticInOuter = false;
-                syntheticMethod = bindings.get(SYNTHETIC_METHOD_FOR_PROPERTY, property);
-            }
-
-            JvmProtoBuf.JvmPropertySignature signature;
-            if (callable instanceof DeserializedPropertyDescriptor) {
-                DeserializedPropertyDescriptor deserializedCallable = (DeserializedPropertyDescriptor) callable;
-                signature = signatureSerializer.copyPropertySignature(
-                        deserializedCallable.getProto().getExtension(JvmProtoBuf.propertySignature),
-                        deserializedCallable.getNameResolver()
-                );
-            }
-            else {
-                signature = signatureSerializer
-                        .propertySignature(fieldType, fieldName, isStaticInOuter, syntheticMethod, getterMethod, setterMethod);
-            }
-            proto.setExtension(JvmProtoBuf.propertySignature, signature);
-        }
-    }
-
-    private void saveImplClassName(
-            @NotNull CallableMemberDescriptor callable,
-            @NotNull ProtoBuf.Callable.Builder proto,
-            @NotNull StringTable stringTable
-    ) {
-        String name = bindings.get(IMPL_CLASS_NAME_FOR_CALLABLE, callable);
-        if (name != null) {
-            proto.setExtension(JvmProtoBuf.implClassName, stringTable.getSimpleNameIndex(Name.identifier(name)));
-        }
-    }
-
-    private static class SignatureSerializer {
-        private final StringTable stringTable;
-
-        public SignatureSerializer(@NotNull StringTable stringTable) {
-            this.stringTable = stringTable;
-        }
-
-        @NotNull
-        public JvmProtoBuf.JvmMethodSignature copyMethodSignature(
-                @NotNull JvmProtoBuf.JvmMethodSignature signature,
-                @NotNull NameResolver nameResolver
-        ) {
-            String method = new SignatureDeserializer(nameResolver).methodSignatureString(signature);
-            return methodSignature(getAsmMethod(method));
-        }
-
-        @NotNull
-        public JvmProtoBuf.JvmMethodSignature methodSignature(@NotNull Method method) {
-            JvmProtoBuf.JvmMethodSignature.Builder signature = JvmProtoBuf.JvmMethodSignature.newBuilder();
-
-            signature.setName(stringTable.getStringIndex(method.getName()));
-
-            signature.setReturnType(type(method.getReturnType()));
-
-            for (Type type : method.getArgumentTypes()) {
-                signature.addParameterType(type(type));
-            }
-
-            return signature.build();
-        }
-
-        @NotNull
-        public JvmProtoBuf.JvmPropertySignature copyPropertySignature(
-                @NotNull JvmProtoBuf.JvmPropertySignature signature,
-                @NotNull NameResolver nameResolver
-        ) {
-            Type fieldType;
-            String fieldName;
-            boolean isStaticInOuter;
-            SignatureDeserializer signatureDeserializer = new SignatureDeserializer(nameResolver);
-            if (signature.hasField()) {
-                JvmProtoBuf.JvmFieldSignature field = signature.getField();
-                fieldType = Type.getType(signatureDeserializer.typeDescriptor(field.getType()));
-                fieldName = nameResolver.getName(field.getName()).asString();
-                isStaticInOuter = field.getIsStaticInOuter();
-            }
-            else {
-                fieldType = null;
-                fieldName = null;
-                isStaticInOuter = false;
-            }
-
-            Method syntheticMethod = signature.hasSyntheticMethod()
-                    ? getAsmMethod(signatureDeserializer.methodSignatureString(signature.getSyntheticMethod()))
-                    : null;
-
-            Method getter = signature.hasGetter() ? getAsmMethod(signatureDeserializer.methodSignatureString(signature.getGetter())) : null;
-            Method setter = signature.hasSetter() ? getAsmMethod(signatureDeserializer.methodSignatureString(signature.getSetter())) : null;
-
-            return propertySignature(fieldType, fieldName, isStaticInOuter, syntheticMethod, getter, setter);
-        }
-
-        @NotNull
-        public JvmProtoBuf.JvmPropertySignature propertySignature(
-                @Nullable Type fieldType,
-                @Nullable String fieldName,
-                boolean isStaticInOuter,
-                @Nullable Method syntheticMethod,
-                @Nullable Method getter,
-                @Nullable Method setter
-        ) {
-            JvmProtoBuf.JvmPropertySignature.Builder signature = JvmProtoBuf.JvmPropertySignature.newBuilder();
-
-            if (fieldType != null) {
-                assert fieldName != null : "Field name shouldn't be null when there's a field type: " + fieldType;
-                signature.setField(fieldSignature(fieldType, fieldName, isStaticInOuter));
-            }
-
-            if (syntheticMethod != null) {
-                signature.setSyntheticMethod(methodSignature(syntheticMethod));
-            }
-
-            if (getter != null) {
-                signature.setGetter(methodSignature(getter));
-            }
-            if (setter != null) {
-                signature.setSetter(methodSignature(setter));
-            }
-
-            return signature.build();
-        }
-
-        @NotNull
-        public JvmProtoBuf.JvmFieldSignature fieldSignature(@NotNull Type type, @NotNull String name, boolean isStaticInOuter) {
-            JvmProtoBuf.JvmFieldSignature.Builder signature = JvmProtoBuf.JvmFieldSignature.newBuilder();
-            signature.setName(stringTable.getStringIndex(name));
-            signature.setType(type(type));
-            if (isStaticInOuter) {
-                signature.setIsStaticInOuter(true);
-            }
-            return signature.build();
-        }
-
-        @NotNull
-        public JvmProtoBuf.JvmType type(@NotNull Type givenType) {
-            JvmProtoBuf.JvmType.Builder builder = JvmProtoBuf.JvmType.newBuilder();
-
-            Type type = givenType;
-            if (type.getSort() == Type.ARRAY) {
-                builder.setArrayDimension(type.getDimensions());
-                type = type.getElementType();
-            }
-
-            if (type.getSort() == Type.OBJECT) {
-                FqName fqName = internalNameToFqName(type.getInternalName());
-                builder.setClassFqName(stringTable.getFqNameIndex(fqName));
-            }
-            else {
-                builder.setPrimitiveType(JvmProtoBuf.JvmType.PrimitiveType.valueOf(type.getSort()));
-            }
-
-            return builder.build();
-        }
-
-        @NotNull
-        private static FqName internalNameToFqName(@NotNull String internalName) {
-            return FqName.fromSegments(Arrays.asList(internalName.split("/")));
-        }
-    }
-
-    @NotNull
-    private static Method getAsmMethod(@NotNull String nameAndDesc) {
-        int indexOf = nameAndDesc.indexOf('(');
-        return new Method(nameAndDesc.substring(0, indexOf), nameAndDesc.substring(indexOf));
-    }
-}

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticGenerator.kt

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import org.jetbrains.kotlin.backend.common.CodegenUtil
+import org.jetbrains.kotlin.codegen.context.MethodContext
+import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.Synthetic
+import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
+import org.jetbrains.org.objectweb.asm.MethodVisitor
+import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
+
+class JvmStaticGenerator(
+        val descriptor: FunctionDescriptor,
+        val declarationOrigin: JvmDeclarationOrigin,
+        val state: GenerationState
+) : Function2<ImplementationBodyCodegen, ClassBuilder, Unit> {
+    private val typeMapper = state.typeMapper
+
+    override fun invoke(codegen: ImplementationBodyCodegen, classBuilder: ClassBuilder) {
+        val staticFunctionDescriptor = createStaticFunctionDescriptor(descriptor)
+
+        val originElement = declarationOrigin.element
+        codegen.functionCodegen.generateMethod(
+                Synthetic(originElement, staticFunctionDescriptor),
+                staticFunctionDescriptor,
+                object : FunctionGenerationStrategy() {
+                    override fun generateBody(
+                            mv: MethodVisitor,
+                            frameMap: FrameMap,
+                            signature: JvmMethodSignature,
+                            context: MethodContext,
+                            parentCodegen: MemberCodegen<*>
+                    ) {
+                        val iv = InstructionAdapter(mv)
+                        val classDescriptor = descriptor.containingDeclaration as ClassDescriptor
+                        val singletonValue = StackValue.singleton(classDescriptor, typeMapper)
+                        singletonValue.put(singletonValue.type, iv)
+                        var index = 0
+                        val asmMethod = signature.asmMethod
+                        for (paramType in asmMethod.argumentTypes) {
+                            iv.load(index, paramType)
+                            index += paramType.size
+                        }
+
+                        val syntheticOrOriginalMethod = typeMapper.mapToCallableMethod(
+                                codegen.getContext().accessibleDescriptor(descriptor, /* superCallTarget = */ null),
+                                false
+                        )
+                        syntheticOrOriginalMethod.genInvokeInstruction(iv)
+                        iv.areturn(asmMethod.returnType)
+                    }
+                }
+        )
+
+        if (originElement is KtNamedFunction) {
+            codegen.functionCodegen.generateOverloadsWithDefaultValues(originElement, staticFunctionDescriptor, descriptor)
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        public fun createStaticFunctionDescriptor(descriptor: FunctionDescriptor): FunctionDescriptor {
+            val memberDescriptor = if (descriptor is PropertyAccessorDescriptor) descriptor.getCorrespondingProperty() else descriptor
+            val copies = CodegenUtil.copyFunctions(
+                    memberDescriptor,
+                    memberDescriptor,
+                    descriptor.getContainingDeclaration().getContainingDeclaration(),
+                    descriptor.getModality(),
+                    descriptor.getVisibility(),
+                    CallableMemberDescriptor.Kind.SYNTHESIZED,
+                    false
+            )
+            val staticFunctionDescriptor = copies[descriptor]!!
+            return staticFunctionDescriptor
+        }
+    }
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java

@@ -21,11 +21,10 @@ import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.fileClasses.JvmFileClassInfo;
-import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
-import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.kotlin.psi.JetScript;
+import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
+import org.jetbrains.kotlin.psi.KtFile;
+import org.jetbrains.kotlin.psi.KtScript;
 import org.jetbrains.kotlin.resolve.ScriptNameUtil;
 import org.jetbrains.org.objectweb.asm.Type;
 
@@ -38,10 +37,9 @@ import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.registerClassN
 public class KotlinCodegenFacade {
 
     public static void prepareForCompilation(@NotNull GenerationState state) {
-        for (JetFile file : state.getFiles()) {
+        for (KtFile file : state.getFiles()) {
             if (file.isScript()) {
-                // SCRIPT: register class name for scripting from this file, move outside of this function
-                JetScript script = file.getScript();
+                KtScript script = file.getScript();
                 assert script != null;
 
                 FqName name = ScriptNameUtil.classNameForScript(script);
@@ -63,44 +61,60 @@ public class KotlinCodegenFacade {
 
         ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
 
-        MultiMap<FqName, JetFile> packageFqNameToFiles = new MultiMap<FqName, JetFile>();
-        MultiMap<FqName, JetFile> multifileClassFqNameToFiles = new MultiMap<FqName, JetFile>();
+        doGenerateFiles(state.getFiles(), state, errorHandler);
+    }
 
-        for (JetFile file : state.getFiles()) {
+    public static void doGenerateFiles(
+            @NotNull Collection<KtFile> files,
+            @NotNull GenerationState state,
+            @NotNull CompilationErrorHandler errorHandler
+    ) {
+        MultiMap<FqName, KtFile> filesInPackages = new MultiMap<FqName, KtFile>();
+        MultiMap<FqName, KtFile> filesInMultifileClasses = new MultiMap<FqName, KtFile>();
+
+        for (KtFile file : files) {
             if (file == null) throw new IllegalArgumentException("A null file given for compilation");
+
             JvmFileClassInfo fileClassInfo = state.getFileClassesProvider().getFileClassInfo(file);
-            if (fileClassInfo.getIsMultifileClass()) {
-                multifileClassFqNameToFiles.putValue(fileClassInfo.getFacadeClassFqName(), file);
-            }
-            else if (state.getPackageFacadesAsMultifileClasses()) {
-                multifileClassFqNameToFiles.putValue(PackageClassUtils.getPackageClassFqName(file.getPackageFqName()), file);
+
+            if (fileClassInfo.getWithJvmMultifileClass()) {
+                filesInMultifileClasses.putValue(fileClassInfo.getFacadeClassFqName(), file);
             }
             else {
-                packageFqNameToFiles.putValue(file.getPackageFqName(), file);
+                filesInPackages.putValue(file.getPackageFqName(), file);
             }
         }
 
+        Set<FqName> obsoleteMultifileClasses = new HashSet<FqName>(state.getObsoleteMultifileClasses());
+        for (FqName multifileClassFqName : Sets.union(filesInMultifileClasses.keySet(), obsoleteMultifileClasses)) {
+            doCheckCancelled(state);
+            generateMultifileClass(state, multifileClassFqName, filesInMultifileClasses.get(multifileClassFqName), errorHandler);
+        }
+
         Set<FqName> packagesWithObsoleteParts = new HashSet<FqName>(state.getPackagesWithObsoleteParts());
-        for (FqName packageFqName : Sets.union(packagesWithObsoleteParts, packageFqNameToFiles.keySet())) {
-            ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
-            generatePackage(state, packageFqName, packageFqNameToFiles.get(packageFqName), errorHandler);
+        for (FqName packageFqName : Sets.union(packagesWithObsoleteParts, filesInPackages.keySet())) {
+            doCheckCancelled(state);
+            generatePackage(state, packageFqName, filesInPackages.get(packageFqName), errorHandler);
         }
 
-        for (FqName multifileClassFqName : multifileClassFqNameToFiles.keySet()) {
-            ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
-            generateMultifileClass(state, multifileClassFqName, multifileClassFqNameToFiles.get(multifileClassFqName), errorHandler);
-        }
-
-        ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
+        doCheckCancelled(state);
         state.getFactory().done();
     }
 
+    private static void doCheckCancelled(GenerationState state) {
+        if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
+            ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
+        }
+    }
+
     public static void generatePackage(
             @NotNull GenerationState state,
             @NotNull FqName packageFqName,
-            @NotNull Collection<JetFile> jetFiles,
+            @NotNull Collection<KtFile> jetFiles,
             @NotNull CompilationErrorHandler errorHandler
     ) {
+        // We do not really generate package class, but use old package fqName to identify package in module-info.
+        //FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(packageFqName);
         PackageCodegen codegen = state.getFactory().forPackage(packageFqName, jetFiles);
         codegen.generate(errorHandler);
     }
@@ -108,7 +122,7 @@ public class KotlinCodegenFacade {
     private static void generateMultifileClass(
             @NotNull GenerationState state,
             @NotNull FqName multifileClassFqName,
-            @NotNull Collection<JetFile> files,
+            @NotNull Collection<KtFile> files,
             @NotNull CompilationErrorHandler handler
     ) {
         MultifileClassCodegen codegen = state.getFactory().forMultifileClass(multifileClassFqName, files);

compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java

@@ -17,11 +17,13 @@
 package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.progress.ProcessCanceledException;
+import com.intellij.psi.PsiElement;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.backend.common.CodegenUtil;
 import org.jetbrains.kotlin.codegen.context.*;
 import org.jetbrains.kotlin.codegen.inline.*;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
@@ -29,26 +31,29 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.annotations.Annotations;
 import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl;
-import org.jetbrains.kotlin.fileClasses.FileClassesPackage;
+import org.jetbrains.kotlin.fileClasses.FileClasses;
 import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider;
+import org.jetbrains.kotlin.load.java.JavaVisibilities;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.name.SpecialNames;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.kotlin.resolve.BindingContextUtils;
-import org.jetbrains.kotlin.resolve.BindingTrace;
-import org.jetbrains.kotlin.resolve.TemporaryBindingTrace;
-import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
+import org.jetbrains.kotlin.resolve.*;
+import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt;
 import org.jetbrains.kotlin.resolve.constants.ConstantValue;
 import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator;
-import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage;
+import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes;
-import org.jetbrains.kotlin.resolve.source.SourcePackage;
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
+import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature;
+import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
+import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver;
+import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
 import org.jetbrains.kotlin.storage.LockBasedStorageManager;
 import org.jetbrains.kotlin.storage.NotNullLazyValue;
 import org.jetbrains.kotlin.types.ErrorUtils;
-import org.jetbrains.kotlin.types.JetType;
+import org.jetbrains.kotlin.types.KotlinType;
+import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
@@ -60,13 +65,14 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.calculateInnerClassAccessFlag
 import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
 import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED;
 import static org.jetbrains.kotlin.resolve.BindingContext.VARIABLE;
+import static org.jetbrains.kotlin.resolve.DescriptorUtils.isCompanionObject;
+import static org.jetbrains.kotlin.resolve.DescriptorUtils.isStaticDeclaration;
 import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*;
-import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin;
-import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.TraitImpl;
 import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN;
+import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt.Synthetic;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
-public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclarationContainer*/> {
+public abstract class MemberCodegen<T extends KtElement/* TODO: & JetDeclarationContainer*/> {
     protected final GenerationState state;
     protected final T element;
     protected final FieldOwnerContext context;
@@ -117,7 +123,9 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
 
         generateSyntheticParts();
 
-        generateKotlinAnnotation();
+        if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
+            generateKotlinAnnotation();
+        }
 
         done();
     }
@@ -136,6 +144,26 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         return null;
     }
 
+    public static void markLineNumberForSyntheticFunction(@Nullable ClassDescriptor declarationDescriptor, @NotNull InstructionAdapter v) {
+        if (declarationDescriptor == null) {
+            return;
+        }
+
+        PsiElement classElement = DescriptorToSourceUtils.getSourceFromDescriptor(declarationDescriptor);
+        if (classElement != null) {
+            markLineNumberForSyntheticFunction(classElement, v);
+        }
+    }
+
+    public static void markLineNumberForSyntheticFunction(@NotNull PsiElement element, @NotNull InstructionAdapter v) {
+        Integer lineNumber = CodegenUtil.getLineNumberForElement(element, false);
+        if (lineNumber != null) {
+            Label label = new Label();
+            v.visitLabel(label);
+            v.visitLineNumber(lineNumber, label);
+        }
+    }
+
     protected void done() {
         if (clInit != null) {
             clInit.v.visitInsn(RETURN);
@@ -151,10 +179,10 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         v.done();
     }
 
-    public void genFunctionOrProperty(@NotNull JetDeclaration functionOrProperty) {
-        if (functionOrProperty instanceof JetNamedFunction) {
+    public void genFunctionOrProperty(@NotNull KtDeclaration functionOrProperty) {
+        if (functionOrProperty instanceof KtNamedFunction) {
             try {
-                functionCodegen.gen((JetNamedFunction) functionOrProperty);
+                functionCodegen.gen((KtNamedFunction) functionOrProperty);
             }
             catch (ProcessCanceledException e) {
                 throw e;
@@ -166,9 +194,9 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
                 throw new CompilationException("Failed to generate function " + functionOrProperty.getName(), e, functionOrProperty);
             }
         }
-        else if (functionOrProperty instanceof JetProperty) {
+        else if (functionOrProperty instanceof KtProperty) {
             try {
-                propertyCodegen.gen((JetProperty) functionOrProperty);
+                propertyCodegen.gen((KtProperty) functionOrProperty);
             }
             catch (ProcessCanceledException e) {
                 throw e;
@@ -187,7 +215,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
 
     public static void genClassOrObject(
             @NotNull CodegenContext parentContext,
-            @NotNull JetClassOrObject aClass,
+            @NotNull KtClassOrObject aClass,
             @NotNull GenerationState state,
             @Nullable MemberCodegen<?> parentCodegen
     ) {
@@ -203,16 +231,9 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         }
 
         Type classType = state.getTypeMapper().mapClass(descriptor);
-        ClassBuilder classBuilder = state.getFactory().newVisitor(OtherOrigin(aClass, descriptor), classType, aClass.getContainingFile());
+        ClassBuilder classBuilder = state.getFactory().newVisitor(JvmDeclarationOriginKt.OtherOrigin(aClass, descriptor), classType, aClass.getContainingFile());
         ClassContext classContext = parentContext.intoClass(descriptor, OwnerKind.IMPLEMENTATION, state);
-        new ImplementationBodyCodegen(aClass, classContext, classBuilder, state, parentCodegen).generate();
-
-        if (aClass instanceof JetClass && ((JetClass) aClass).isInterface()) {
-            Type traitImplType = state.getTypeMapper().mapTraitImpl(descriptor);
-            ClassBuilder traitImplBuilder = state.getFactory().newVisitor(TraitImpl(aClass, descriptor), traitImplType, aClass.getContainingFile());
-            ClassContext traitImplContext = parentContext.intoClass(descriptor, OwnerKind.TRAIT_IMPL, state);
-            new TraitImplBodyCodegen(aClass, traitImplContext, traitImplBuilder, state, parentCodegen).generate();
-        }
+        new ImplementationBodyCodegen(aClass, classContext, classBuilder, state, parentCodegen, false).generate();
     }
 
     private static void badDescriptor(ClassDescriptor descriptor, ClassBuilderMode mode) {
@@ -221,7 +242,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         }
     }
 
-    public void genClassOrObject(JetClassOrObject aClass) {
+    public void genClassOrObject(KtClassOrObject aClass) {
         genClassOrObject(context, aClass, state, this);
     }
 
@@ -296,7 +317,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
                 return implementationOwnerType;
             }
             else {
-                return FileClassesPackage.getFileClassType(fileClassesProvider, element.getContainingJetFile());
+                return FileClasses.getFileClassType(fileClassesProvider, element.getContainingKtFile());
             }
         }
         /*disabled cause of KT-7775
@@ -330,13 +351,13 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
     protected ExpressionCodegen createOrGetClInitCodegen() {
         DeclarationDescriptor descriptor = context.getContextDescriptor();
         if (clInit == null) {
-            MethodVisitor mv = v.newMethod(OtherOrigin(descriptor), ACC_STATIC, "<clinit>", "()V", null, null);
+            MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(descriptor), ACC_STATIC, "<clinit>", "()V", null, null);
             SimpleFunctionDescriptorImpl clInit =
-                    SimpleFunctionDescriptorImpl.create(descriptor, Annotations.EMPTY, Name.special("<clinit>"), SYNTHESIZED,
-                                                        SourcePackage.toSourceElement(element));
+                    SimpleFunctionDescriptorImpl.create(descriptor, Annotations.Companion.getEMPTY(), Name.special("<clinit>"), SYNTHESIZED,
+                                                        KotlinSourceElementKt.toSourceElement(element));
             clInit.initialize(null, null, Collections.<TypeParameterDescriptor>emptyList(),
                               Collections.<ValueParameterDescriptor>emptyList(),
-                              DescriptorUtilPackage.getModule(descriptor).getBuiltIns().getUnitType(),
+                              DescriptorUtilsKt.getModule(descriptor).getBuiltIns().getUnitType(),
                               null, Visibilities.PRIVATE);
 
             this.clInit = new ExpressionCodegen(mv, new FrameMap(), Type.VOID_TYPE, context.intoFunction(clInit), state, this);
@@ -346,14 +367,14 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
 
     protected void generateInitializers(@NotNull Function0<ExpressionCodegen> createCodegen) {
         NotNullLazyValue<ExpressionCodegen> codegen = LockBasedStorageManager.NO_LOCKS.createLazyValue(createCodegen);
-        for (JetDeclaration declaration : ((JetDeclarationContainer) element).getDeclarations()) {
-            if (declaration instanceof JetProperty) {
-                if (shouldInitializeProperty((JetProperty) declaration)) {
-                    initializeProperty(codegen.invoke(), (JetProperty) declaration);
+        for (KtDeclaration declaration : ((KtDeclarationContainer) element).getDeclarations()) {
+            if (declaration instanceof KtProperty) {
+                if (shouldInitializeProperty((KtProperty) declaration)) {
+                    initializeProperty(codegen.invoke(), (KtProperty) declaration);
                 }
             }
-            else if (declaration instanceof JetClassInitializer) {
-                JetExpression body = ((JetClassInitializer) declaration).getBody();
+            else if (declaration instanceof KtClassInitializer) {
+                KtExpression body = ((KtClassInitializer) declaration).getBody();
                 if (body != null) {
                     codegen.invoke().gen(body, Type.VOID_TYPE);
                 }
@@ -361,35 +382,30 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         }
     }
 
-    private void initializeProperty(@NotNull ExpressionCodegen codegen, @NotNull JetProperty property) {
+    private void initializeProperty(@NotNull ExpressionCodegen codegen, @NotNull KtProperty property) {
         PropertyDescriptor propertyDescriptor = (PropertyDescriptor) bindingContext.get(VARIABLE, property);
         assert propertyDescriptor != null;
 
-        JetExpression initializer = property.getDelegateExpressionOrInitializer();
+        KtExpression initializer = property.getDelegateExpressionOrInitializer();
         assert initializer != null : "shouldInitializeProperty must return false if initializer is null";
 
-        StackValue.Property propValue = codegen.intermediateValueForProperty(propertyDescriptor, true, null, true, StackValue.LOCAL_0);
+        StackValue.Property propValue = codegen.intermediateValueForProperty(propertyDescriptor, true, false, null, true, StackValue.LOCAL_0);
 
         propValue.store(codegen.gen(initializer), codegen.v);
-
-        ResolvedCall<FunctionDescriptor> pdResolvedCall =
-                bindingContext.get(BindingContext.DELEGATED_PROPERTY_PD_RESOLVED_CALL, propertyDescriptor);
-        if (pdResolvedCall != null) {
-            int index = PropertyCodegen.indexOfDelegatedProperty(property);
-            StackValue lastValue = PropertyCodegen.invokeDelegatedPropertyConventionMethod(
-                    propertyDescriptor, codegen, typeMapper, pdResolvedCall, index, 0
-            );
-            lastValue.put(Type.VOID_TYPE, codegen.v);
-        }
     }
 
-    private boolean shouldInitializeProperty(@NotNull JetProperty property) {
+    private boolean shouldInitializeProperty(@NotNull KtProperty property) {
         if (!property.hasDelegateExpressionOrInitializer()) return false;
 
         PropertyDescriptor propertyDescriptor = (PropertyDescriptor) bindingContext.get(VARIABLE, property);
         assert propertyDescriptor != null;
 
-        JetExpression initializer = property.getInitializer();
+        if (propertyDescriptor.isConst()) {
+            //const initializer always inlined
+            return false;
+        }
+
+        KtExpression initializer = property.getInitializer();
 
         ConstantValue<?> initializerValue = computeInitializerValue(property, propertyDescriptor, initializer);
         // we must write constant values for fields in light classes,
@@ -397,16 +413,16 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         if (initializerValue == null) return state.getClassBuilderMode() != ClassBuilderMode.LIGHT_CLASSES;
 
         //TODO: OPTIMIZATION: don't initialize static final fields
-        JetType jetType = getPropertyOrDelegateType(property, propertyDescriptor);
+        KotlinType jetType = getPropertyOrDelegateType(property, propertyDescriptor);
         Type type = typeMapper.mapType(jetType);
         return !skipDefaultValue(propertyDescriptor, initializerValue.getValue(), type);
     }
 
     @Nullable
     private ConstantValue<?> computeInitializerValue(
-            @NotNull JetProperty property,
+            @NotNull KtProperty property,
             @NotNull PropertyDescriptor propertyDescriptor,
-            @Nullable JetExpression initializer
+            @Nullable KtExpression initializer
     ) {
         if (property.isVar() && initializer != null) {
             BindingTrace tempTrace = TemporaryBindingTrace.create(state.getBindingTrace(), "property initializer");
@@ -416,10 +432,10 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
     }
 
     @NotNull
-    private JetType getPropertyOrDelegateType(@NotNull JetProperty property, @NotNull PropertyDescriptor descriptor) {
-        JetExpression delegateExpression = property.getDelegateExpression();
+    private KotlinType getPropertyOrDelegateType(@NotNull KtProperty property, @NotNull PropertyDescriptor descriptor) {
+        KtExpression delegateExpression = property.getDelegateExpression();
         if (delegateExpression != null) {
-            JetType delegateType = bindingContext.getType(delegateExpression);
+            KotlinType delegateType = bindingContext.getType(delegateExpression);
             assert delegateType != null : "Type of delegate expression should be recorded";
             return delegateType;
         }
@@ -463,41 +479,11 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         return false;
     }
 
-    public static void generateReflectionObjectField(
-            @NotNull GenerationState state,
-            @NotNull Type thisAsmType,
-            @NotNull ClassBuilder classBuilder,
-            @NotNull Method factory,
-            @NotNull String fieldName,
-            @NotNull InstructionAdapter v
-    ) {
-        String type = factory.getReturnType().getDescriptor();
-        // TODO: generic signature
-        classBuilder.newField(NO_ORIGIN, ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, fieldName, type, null, null);
-
-        if (state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES) return;
-
-        v.aconst(thisAsmType);
-        if (factory.getArgumentTypes().length == 2) {
-            v.aconst(state.getModuleName());
-        }
-        v.invokestatic(REFLECTION, factory.getName(), factory.getDescriptor(), false);
-        v.putstatic(thisAsmType.getInternalName(), fieldName, type);
-    }
-
-    public static void generateModuleNameField(
-            @NotNull GenerationState state,
-            @NotNull ClassBuilder classBuilder
-    ) {
-        classBuilder.newField(NO_ORIGIN, ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.MODULE_NAME_FIELD,
-                              AsmTypes.JAVA_STRING_TYPE.getDescriptor(), null, state.getModuleName());
-    }
-
     protected void generatePropertyMetadataArrayFieldIfNeeded(@NotNull Type thisAsmType) {
-        List<JetProperty> delegatedProperties = new ArrayList<JetProperty>();
-        for (JetDeclaration declaration : ((JetDeclarationContainer) element).getDeclarations()) {
-            if (declaration instanceof JetProperty) {
-                JetProperty property = (JetProperty) declaration;
+        List<KtProperty> delegatedProperties = new ArrayList<KtProperty>();
+        for (KtDeclaration declaration : ((KtDeclarationContainer) element).getDeclarations()) {
+            if (declaration instanceof KtProperty) {
+                KtProperty property = (KtProperty) declaration;
                 if (property.hasDelegate()) {
                     delegatedProperties.add(property);
                 }
@@ -505,7 +491,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         }
         if (delegatedProperties.isEmpty()) return;
 
-        v.newField(NO_ORIGIN, ACC_PRIVATE | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.PROPERTY_METADATA_ARRAY_NAME,
+        v.newField(NO_ORIGIN, ACC_PRIVATE | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.DELEGATED_PROPERTIES_ARRAY_NAME,
                    "[" + PROPERTY_METADATA_TYPE, null, null);
 
         if (state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES) return;
@@ -515,18 +501,48 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         iv.newarray(PROPERTY_METADATA_TYPE);
 
         for (int i = 0, size = delegatedProperties.size(); i < size; i++) {
-            VariableDescriptor property = BindingContextUtils.getNotNull(bindingContext, VARIABLE, delegatedProperties.get(i));
+            PropertyDescriptor property =
+                    (PropertyDescriptor) BindingContextUtils.getNotNull(bindingContext, VARIABLE, delegatedProperties.get(i));
 
             iv.dup();
             iv.iconst(i);
-            iv.anew(PROPERTY_METADATA_IMPL_TYPE);
-            iv.dup();
-            iv.visitLdcInsn(property.getName().asString());
-            iv.invokespecial(PROPERTY_METADATA_IMPL_TYPE.getInternalName(), "<init>", "(Ljava/lang/String;)V", false);
-            iv.astore(PROPERTY_METADATA_IMPL_TYPE);
+
+            StackValue value;
+            // TODO: remove this option and always generate PropertyReferenceNImpl creation
+            if ("true".equalsIgnoreCase(System.getProperty("kotlin.jvm.optimize.delegated.properties"))) {
+                int receiverCount = (property.getDispatchReceiverParameter() != null ? 1 : 0) +
+                                    (property.getExtensionReceiverParameter() != null ? 1 : 0);
+                Type implType = property.isVar() ? MUTABLE_PROPERTY_REFERENCE_IMPL[receiverCount] : PROPERTY_REFERENCE_IMPL[receiverCount];
+                iv.anew(implType);
+                iv.dup();
+                // TODO: generate the container once and save to a local field instead
+                ClosureCodegen.generateCallableReferenceDeclarationContainer(iv, property, state);
+                iv.aconst(property.getName().asString());
+                iv.aconst(PropertyReferenceCodegen.getPropertyReferenceSignature(property, state));
+                iv.invokespecial(
+                        implType.getInternalName(), "<init>",
+                        Type.getMethodDescriptor(Type.VOID_TYPE, K_DECLARATION_CONTAINER_TYPE, JAVA_STRING_TYPE, JAVA_STRING_TYPE), false
+                );
+                value = StackValue.onStack(implType);
+                Method wrapper = PropertyReferenceCodegen.getWrapperMethodForPropertyReference(property, receiverCount);
+                iv.invokestatic(REFLECTION, wrapper.getName(), wrapper.getDescriptor(), false);
+            }
+            else {
+                ReceiverParameterDescriptor dispatchReceiver = property.getDispatchReceiverParameter();
+
+                //noinspection ConstantConditions
+                value = createOrGetClInitCodegen().generatePropertyReference(
+                        delegatedProperties.get(i).getDelegate(), property, property,
+                        dispatchReceiver != null ? new TransientReceiver(dispatchReceiver.getType()) : ReceiverValue.NO_RECEIVER
+                );
+            }
+
+            value.put(PROPERTY_METADATA_TYPE, iv);
+
+            iv.astore(PROPERTY_METADATA_TYPE);
         }
 
-        iv.putstatic(thisAsmType.getInternalName(), JvmAbi.PROPERTY_METADATA_ARRAY_NAME, "[" + PROPERTY_METADATA_TYPE);
+        iv.putstatic(thisAsmType.getInternalName(), JvmAbi.DELEGATED_PROPERTIES_ARRAY_NAME, "[" + PROPERTY_METADATA_TYPE);
     }
 
     public String getClassName() {
@@ -565,7 +581,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
             @NotNull Type fieldAsmType,
             @NotNull Function1<InstructionAdapter, Unit> initialization
     ) {
-        v.newField(OtherOrigin(element), ACC_STATIC | ACC_FINAL | ACC_PUBLIC, JvmAbi.INSTANCE_FIELD, fieldAsmType.getDescriptor(),
+        v.newField(JvmDeclarationOriginKt.OtherOrigin(element), ACC_STATIC | ACC_FINAL | ACC_PUBLIC, JvmAbi.INSTANCE_FIELD, fieldAsmType.getDescriptor(),
                    null, null);
 
         if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
@@ -577,4 +593,128 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
             iv.putstatic(thisAsmType.getInternalName(), JvmAbi.INSTANCE_FIELD, fieldAsmType.getDescriptor());
         }
     }
+
+    protected void generateSyntheticAccessors() {
+        for (AccessorForCallableDescriptor<?> accessor : ((CodegenContext<?>) context).getAccessors()) {
+            generateSyntheticAccessor(accessor);
+        }
+    }
+
+    private void generateSyntheticAccessor(@NotNull AccessorForCallableDescriptor<?> accessorForCallableDescriptor) {
+        if (accessorForCallableDescriptor instanceof FunctionDescriptor) {
+            final FunctionDescriptor accessor = (FunctionDescriptor) accessorForCallableDescriptor;
+            final FunctionDescriptor original = (FunctionDescriptor) accessorForCallableDescriptor.getCalleeDescriptor();
+            functionCodegen.generateMethod(
+                    Synthetic(null, original), accessor,
+                    new FunctionGenerationStrategy.CodegenBased<FunctionDescriptor>(state, accessor) {
+                        @Override
+                        public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
+                            markLineNumberForSyntheticFunction(element, codegen.v);
+
+                            generateMethodCallTo(original, accessor, codegen.v);
+                            codegen.v.areturn(signature.getReturnType());
+                        }
+                    }
+            );
+        }
+        else if (accessorForCallableDescriptor instanceof AccessorForPropertyDescriptor) {
+            final AccessorForPropertyDescriptor accessor = (AccessorForPropertyDescriptor) accessorForCallableDescriptor;
+            final PropertyDescriptor original = accessor.getCalleeDescriptor();
+
+            class PropertyAccessorStrategy extends FunctionGenerationStrategy.CodegenBased<PropertyAccessorDescriptor> {
+                public PropertyAccessorStrategy(@NotNull PropertyAccessorDescriptor callableDescriptor) {
+                    super(MemberCodegen.this.state, callableDescriptor);
+                }
+
+                @Override
+                public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
+                    boolean syntheticBackingField = accessor instanceof AccessorForPropertyBackingFieldFromLocal;
+                    boolean forceField = (AsmUtil.isPropertyWithBackingFieldInOuterClass(original) &&
+                                          !isCompanionObject(accessor.getContainingDeclaration())) ||
+                                         syntheticBackingField ||
+                                         original.getVisibility() == JavaVisibilities.PROTECTED_STATIC_VISIBILITY;
+                    StackValue property = codegen.intermediateValueForProperty(
+                            original, forceField, syntheticBackingField, accessor.getSuperCallTarget(), true, StackValue.none()
+                    );
+
+                    InstructionAdapter iv = codegen.v;
+
+                    markLineNumberForSyntheticFunction(element, iv);
+
+                    Type[] argTypes = signature.getAsmMethod().getArgumentTypes();
+                    for (int i = 0, reg = 0; i < argTypes.length; i++) {
+                        Type argType = argTypes[i];
+                        iv.load(reg, argType);
+                        //noinspection AssignmentToForLoopParameter
+                        reg += argType.getSize();
+                    }
+
+                    if (callableDescriptor instanceof PropertyGetterDescriptor) {
+                        property.put(property.type, iv);
+                    }
+                    else {
+                        property.store(StackValue.onStack(property.type), iv, true);
+                    }
+
+                    iv.areturn(signature.getReturnType());
+                }
+            }
+
+            if (accessor.isWithSyntheticGetterAccessor()) {
+                PropertyGetterDescriptor getter = accessor.getGetter();
+                assert getter != null;
+                functionCodegen.generateMethod(Synthetic(null, original.getGetter() != null ? original.getGetter() : original),
+                                               getter, new PropertyAccessorStrategy(getter));
+            }
+
+            if (accessor.isVar() && accessor.isWithSyntheticSetterAccessor()) {
+                PropertySetterDescriptor setter = accessor.getSetter();
+                assert setter != null;
+
+                functionCodegen.generateMethod(Synthetic(null, original.getSetter() != null ? original.getSetter() : original),
+                                               setter, new PropertyAccessorStrategy(setter));
+            }
+        }
+        else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private void generateMethodCallTo(
+            @NotNull FunctionDescriptor functionDescriptor,
+            @Nullable FunctionDescriptor accessorDescriptor,
+            @NotNull InstructionAdapter iv
+    ) {
+        CallableMethod callableMethod = typeMapper.mapToCallableMethod(
+                functionDescriptor,
+                accessorDescriptor instanceof AccessorForCallableDescriptor &&
+                ((AccessorForCallableDescriptor) accessorDescriptor).getSuperCallTarget() != null
+        );
+
+        boolean hasDispatchReceiver = !isStaticDeclaration(functionDescriptor);
+        int reg = hasDispatchReceiver ? 1 : 0;
+        boolean accessorIsConstructor = accessorDescriptor instanceof AccessorForConstructorDescriptor;
+        if (!accessorIsConstructor && functionDescriptor instanceof ConstructorDescriptor) {
+            iv.anew(callableMethod.getOwner());
+            iv.dup();
+            reg = 0;
+        }
+        else if (accessorIsConstructor || (accessorDescriptor != null && JetTypeMapper.isAccessor(accessorDescriptor) && hasDispatchReceiver)) {
+            if (!AnnotationUtilKt.isPlatformStaticInObjectOrClass(functionDescriptor)) {
+                iv.load(0, OBJECT_TYPE);
+            }
+        }
+
+        for (Type argType : callableMethod.getParameterTypes()) {
+            if (AsmTypes.DEFAULT_CONSTRUCTOR_MARKER.equals(argType)) {
+                iv.aconst(null);
+            }
+            else {
+                iv.load(reg, argType);
+                reg += argType.getSize();
+            }
+        }
+
+        callableMethod.genInvokeInstruction(iv);
+    }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt

@@ -21,13 +21,14 @@ import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.util.ArrayUtil
 import com.intellij.util.SmartList
 import org.jetbrains.kotlin.codegen.context.FieldOwnerContext
+import org.jetbrains.kotlin.codegen.context.MethodContext
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
+import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
-import org.jetbrains.kotlin.fileClasses.getFileClassType
-import org.jetbrains.kotlin.load.java.JvmAbi
+import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.load.kotlin.PackageParts
 import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider
@@ -36,33 +37,43 @@ import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStat
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.MemberComparator
-import org.jetbrains.kotlin.resolve.jvm.AsmTypes
-import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
+import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.MultifileClass
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.MultifileClassPart
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.OtherOrigin
+import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
+import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
+import org.jetbrains.kotlin.resolve.scopes.MemberScope
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
+import org.jetbrains.org.objectweb.asm.MethodVisitor
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
-import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import java.util.*
 
-
 public class MultifileClassCodegen(
         private val state: GenerationState,
-        public val files: Collection<JetFile>,
+        public val files: Collection<KtFile>,
         private val facadeFqName: FqName
 ) {
     private val facadeClassType = AsmUtil.asmTypeByFqNameWithoutInnerClasses(facadeFqName)
 
     private val packageFragment = getOnlyPackageFragment(facadeFqName.parent(), files, state.bindingContext)
 
-    private val compiledPackageFragment = getCompiledPackageFragment(facadeFqName.parent(), state)
+    private val compiledPackageFragment = getCompiledPackageFragment(facadeFqName, state)
+
+    private val previouslyCompiledCallables =
+            if (compiledPackageFragment == null)
+                emptyList<DeserializedCallableMemberDescriptor>()
+            else
+                getDeserializedCallables(compiledPackageFragment)
+
+    private fun getDeserializedCallables(compiledPackageFragment: PackageFragmentDescriptor) =
+            compiledPackageFragment.getMemberScope().getContributedDescriptors(DescriptorKindFilter.CALLABLES, MemberScope.ALL_NAME_FILTER).filterIsInstance<DeserializedCallableMemberDescriptor>()
 
     public val packageParts = PackageParts(facadeFqName.parent().asString())
 
-    // TODO incremental compilation support
-    // TODO previouslyCompiledCallables
-    // We can do this (probably without 'compiledPackageFragment') after modifications to part codegen.
-
     private val classBuilder = ClassBuilderOnDemand {
         val originFile = files.firstOrNull()
         val actualPackageFragment = packageFragment ?:
@@ -71,8 +82,10 @@ public class MultifileClassCodegen(
         val declarationOrigin = MultifileClass(originFile, actualPackageFragment, facadeFqName)
         val classBuilder = state.factory.newVisitor(declarationOrigin, facadeClassType, files)
 
-        val filesWithCallables = files.filter { it.declarations.any { it is JetNamedFunction || it is JetProperty } }
-        val singleSourceFile = filesWithCallables.singleOrNull()
+        val filesWithCallables = files.filter { it.declarations.any { it is KtNamedFunction || it is KtProperty } }
+
+        val singleSourceFile = if (previouslyCompiledCallables.isNotEmpty()) null else filesWithCallables.singleOrNull()
+
         classBuilder.defineClass(singleSourceFile, Opcodes.V1_6, FACADE_CLASS_ATTRIBUTES,
                                  facadeClassType.internalName,
                                  null, "java/lang/Object", ArrayUtil.EMPTY_STRING_ARRAY)
@@ -86,6 +99,20 @@ public class MultifileClassCodegen(
         val generateCallableMemberTasks = HashMap<CallableMemberDescriptor, () -> Unit>()
         val partFqNames = arrayListOf<FqName>()
 
+        generateCodeForSourceFiles(errorHandler, generateCallableMemberTasks, partFqNames)
+
+        generateDelegatesToPreviouslyCompiledParts(generateCallableMemberTasks, partFqNames)
+
+        if (!generateCallableMemberTasks.isEmpty()) {
+            generateMultifileFacadeClass(generateCallableMemberTasks, partFqNames)
+        }
+    }
+
+    private fun generateCodeForSourceFiles(
+            errorHandler: CompilationErrorHandler,
+            generateCallableMemberTasks: MutableMap<CallableMemberDescriptor, () -> Unit>,
+            partFqNames: MutableList<FqName>
+    ) {
         for (file in files) {
             ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
             try {
@@ -104,37 +131,25 @@ public class MultifileClassCodegen(
                 }
             }
         }
-
-//        generateDelegationsToPreviouslyCompiled(generateCallableMemberTasks)
-
-        if (!generateCallableMemberTasks.isEmpty()) {
-            generateMultifileFacadeClass(generateCallableMemberTasks, partFqNames)
-        }
     }
 
     private fun generateMultifileFacadeClass(
             tasks: Map<CallableMemberDescriptor, () -> Unit>,
             partFqNames: List<FqName>
     ) {
-        generateKotlinPackageReflectionField()
-        MemberCodegen.generateModuleNameField(state, classBuilder)
-
-        for (member in tasks.keySet().sortedWith(MemberComparator.INSTANCE)) {
+        for (member in tasks.keys.sortedWith(MemberComparator.INSTANCE)) {
             tasks[member]!!()
         }
 
         writeKotlinMultifileFacadeAnnotationIfNeeded(partFqNames)
     }
 
-    public fun generateClassOrObject(classOrObject: JetClassOrObject) {
-        val file = classOrObject.getContainingJetFile()
-        val partType = state.fileClassesProvider.getFileClassType(file)
-        val context = state.rootContext.intoMultifileClassPart(packageFragment!!, facadeClassType, partType)
-        MemberCodegen.genClassOrObject(context, classOrObject, state, null)
+    public fun generateClassOrObject(classOrObject: KtClassOrObject, packagePartContext: FieldOwnerContext<PackageFragmentDescriptor>) {
+        MemberCodegen.genClassOrObject(packagePartContext, classOrObject, state, null)
     }
 
     private fun generatePart(
-            file: JetFile,
+            file: KtFile,
             generateCallableMemberTasks: MutableMap<CallableMemberDescriptor, () -> Unit>,
             partFqNames: MutableList<FqName>
     ) {
@@ -144,20 +159,17 @@ public class MultifileClassCodegen(
         var generatePart = false
         val partClassInfo = state.fileClassesProvider.getFileClassInfo(file)
         val partType = AsmUtil.asmTypeByFqNameWithoutInnerClasses(partClassInfo.fileClassFqName)
-        val partContext = state.rootContext.intoMultifileClassPart(packageFragment, facadeClassType, partType)
+        val partContext = state.rootContext.intoMultifileClassPart(packageFragment, facadeClassType, partType, file)
 
         for (declaration in file.declarations) {
-            if (declaration is JetProperty || declaration is JetNamedFunction) {
-                generatePart = true
-            }
-            else if (declaration is JetClassOrObject) {
-                if (state.generateDeclaredClassFilter.shouldGenerateClass(declaration)) {
-                    generateClassOrObject(declaration)
+            when (declaration) {
+                is KtProperty, is KtNamedFunction -> {
+                    generatePart = true
                 }
-            }
-            else if (declaration is JetScript) {
-                // SCRIPT: generate script code, should be separate execution branch
-                if (state.generateDeclaredClassFilter.shouldGenerateScript(declaration)) {
+                is KtClassOrObject -> if (state.generateDeclaredClassFilter.shouldGenerateClass(declaration)) {
+                    generateClassOrObject(declaration, partContext)
+                }
+                is KtScript -> if (state.generateDeclaredClassFilter.shouldGenerateScript(declaration)) {
                     ScriptCodegen.createScriptCodegen(declaration, state, partContext).generate()
                 }
             }
@@ -173,28 +185,68 @@ public class MultifileClassCodegen(
 
         val builder = state.factory.newVisitor(MultifileClassPart(file, packageFragment, facadeFqName), partType, file)
 
-        MultifileClassPartCodegen(builder, file, partType, facadeFqName, partContext, state).generate()
+        MultifileClassPartCodegen(builder, file, partType, facadeClassType, partContext, state).generate()
 
         val facadeContext = state.rootContext.intoMultifileClass(packageFragment, facadeClassType, partType)
         val memberCodegen = createCodegenForPartOfMultifileFacade(facadeContext)
         for (declaration in file.declarations) {
-            if (declaration is JetNamedFunction || declaration is JetProperty) {
+            if (declaration is KtNamedFunction || declaration is KtProperty) {
                 val descriptor = state.bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration)
                 assert(descriptor is CallableMemberDescriptor) { "Expected callable member, was " + descriptor + " for " + declaration.text }
-                generateCallableMemberTasks.put(descriptor as CallableMemberDescriptor,
-                                                { memberCodegen.genFunctionOrProperty(declaration) })
+                if (!Visibilities.isPrivate((descriptor as CallableMemberDescriptor).visibility)) {
+                    generateCallableMemberTasks.put(descriptor, { memberCodegen.genFunctionOrProperty(declaration) })
+                }
             }
         }
     }
 
-    private fun generateKotlinPackageReflectionField() {
-        val mv = classBuilder.newMethod(JvmDeclarationOrigin.NO_ORIGIN, Opcodes.ACC_STATIC, "<clinit>", "()V", null, null)
-        val method = AsmUtil.method("createKotlinPackage",
-                                    AsmTypes.K_PACKAGE_TYPE, AsmTypes.getType(Class::class.java), AsmTypes.getType(String::class.java))
-        val iv = InstructionAdapter(mv)
-        MemberCodegen.generateReflectionObjectField(state, facadeClassType, classBuilder, method, JvmAbi.KOTLIN_PACKAGE_FIELD_NAME, iv)
-        iv.areturn(Type.VOID_TYPE)
-        FunctionCodegen.endVisit(mv, "package facade static initializer", null)
+    private fun generateDelegatesToPreviouslyCompiledParts(
+            generateCallableMemberTasks: MutableMap<CallableMemberDescriptor, () -> Unit>,
+            partFqNames: MutableList<FqName>
+    ) {
+        if (compiledPackageFragment == null) return
+
+        partFqNames.addAll(compiledPackageFragment.partsNames.map { JvmClassName.byInternalName(it).fqNameForClassNameWithoutDollars })
+
+        for (callable in previouslyCompiledCallables) {
+            val partFqName = JvmFileClassUtil.getPartFqNameForDeserializedCallable(callable)
+            val partType = AsmUtil.asmTypeByFqNameWithoutInnerClasses(partFqName)
+
+            generateCallableMemberTasks[callable] = { generateDelegateToCompiledMember(callable, compiledPackageFragment, partType) }
+        }
+    }
+
+    private fun generateDelegateToCompiledMember(
+            member: CallableMemberDescriptor,
+            compiledPackageFragment: PackageFragmentDescriptor,
+            partType: Type
+    ) {
+        val context = state.rootContext.intoMultifileClass(compiledPackageFragment, facadeClassType, partType)
+
+        val memberCodegen = createCodegenForPartOfMultifileFacade(context)
+
+        when (member) {
+            is DeserializedSimpleFunctionDescriptor -> {
+                memberCodegen.functionCodegen.generateMethod(OtherOrigin(member), member, DelegateToCompiledMemberGenerationStrategy)
+
+                memberCodegen.functionCodegen.generateDefaultIfNeeded(
+                        context.intoFunction(member), member, OwnerKind.PACKAGE, DefaultParameterValueLoader.DEFAULT, null)
+
+                memberCodegen.functionCodegen.generateOverloadsWithDefaultValues(null, member, member)
+            }
+            is DeserializedPropertyDescriptor -> {
+                memberCodegen.propertyCodegen.generateInPackageFacade(member)
+            }
+            else -> {
+                throw IllegalStateException("Unexpected member: " + member)
+            }
+        }
+    }
+
+    object DelegateToCompiledMemberGenerationStrategy : FunctionGenerationStrategy() {
+        override fun generateBody(mv: MethodVisitor, frameMap: FrameMap, signature: JvmMethodSignature, context: MethodContext, parentCodegen: MemberCodegen<*>) {
+            throw IllegalStateException("shouldn't be called")
+        }
     }
 
     private fun writeKotlinMultifileFacadeAnnotationIfNeeded(partFqNames: List<FqName>) {
@@ -203,19 +255,20 @@ public class MultifileClassCodegen(
 
         val av = classBuilder.newAnnotation(AsmUtil.asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_MULTIFILE_CLASS), true)
         JvmCodegenUtil.writeAbiVersion(av)
+        JvmCodegenUtil.writeModuleName(av, state)
 
-        val shortNames = partFqNames.map { it.shortName().asString() }.sorted()
-        val filePartClassNamesArray = av.visitArray(JvmAnnotationNames.FILE_PART_CLASS_NAMES_FIELD_NAME)
-        for (shortName in shortNames) {
-            filePartClassNamesArray.visit(null, shortName)
+        val partInternalNames = partFqNames.map { JvmClassName.byFqNameWithoutInnerClasses(it).internalName }.sorted()
+        val arv = av.visitArray(JvmAnnotationNames.FILE_PART_CLASS_NAMES_FIELD_NAME)
+        for (internalName in partInternalNames) {
+            arv.visit(null, internalName)
         }
-        filePartClassNamesArray.visitEnd()
+        arv.visitEnd()
 
         av.visitEnd()
     }
 
-    private fun createCodegenForPartOfMultifileFacade(facadeContext: FieldOwnerContext<*>): MemberCodegen<JetFile> =
-            object : MemberCodegen<JetFile>(state, null, facadeContext, null, classBuilder) {
+    private fun createCodegenForPartOfMultifileFacade(facadeContext: FieldOwnerContext<*>): MemberCodegen<KtFile> =
+            object : MemberCodegen<KtFile>(state, null, facadeContext, null, classBuilder) {
                 override fun generateDeclaration() = throw UnsupportedOperationException()
                 override fun generateBody() = throw UnsupportedOperationException()
                 override fun generateKotlinAnnotation() = throw UnsupportedOperationException()
@@ -228,7 +281,7 @@ public class MultifileClassCodegen(
     companion object {
         private val FACADE_CLASS_ATTRIBUTES = Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL
 
-        private fun getOnlyPackageFragment(packageFqName: FqName, files: Collection<JetFile>, bindingContext: BindingContext): PackageFragmentDescriptor? {
+        private fun getOnlyPackageFragment(packageFqName: FqName, files: Collection<KtFile>, bindingContext: BindingContext): PackageFragmentDescriptor? {
             val fragments = SmartList<PackageFragmentDescriptor>()
             for (file in files) {
                 val fragment = bindingContext.get(BindingContext.FILE_TO_PACKAGE_FRAGMENT, file)
@@ -246,12 +299,19 @@ public class MultifileClassCodegen(
             return fragments.firstOrNull()
         }
 
-        private fun getCompiledPackageFragment(packageFqName: FqName, state: GenerationState): PackageFragmentDescriptor? =
-                if (!IncrementalCompilation.ENABLED) null
-                else state.module.getPackage(packageFqName).fragments.firstOrNull { fragment ->
+        private fun getCompiledPackageFragment(facadeFqName: FqName, state: GenerationState):
+                IncrementalPackageFragmentProvider.IncrementalPackageFragment.IncrementalMultifileClassPackageFragment? {
+            if (!IncrementalCompilation.isEnabled()) return null
+
+            val packageFqName = facadeFqName.parent()
+
+            val incrementalPackageFragment = state.module.getPackage(packageFqName).fragments.firstOrNull { fragment ->
                     fragment is IncrementalPackageFragmentProvider.IncrementalPackageFragment &&
                     fragment.target == state.targetId
-                }
+                } as IncrementalPackageFragmentProvider.IncrementalPackageFragment?
+
+            return incrementalPackageFragment?.getPackageFragmentForMultifileClass(facadeFqName)
+        }
     }
 
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt

@@ -18,31 +18,27 @@ package org.jetbrains.kotlin.codegen
 
 import com.intellij.util.ArrayUtil
 import org.jetbrains.kotlin.codegen.context.FieldOwnerContext
+import org.jetbrains.kotlin.codegen.serialization.JvmSerializerExtension
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.JetFile
-import org.jetbrains.kotlin.psi.JetNamedFunction
-import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.serialization.DescriptorSerializer
-import org.jetbrains.kotlin.serialization.PackageData
-import org.jetbrains.kotlin.serialization.SerializationUtil
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-import org.jetbrains.kotlin.serialization.jvm.BitEncoding
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
 import java.util.*
 
 public class MultifileClassPartCodegen(
         v: ClassBuilder,
-        file: JetFile,
+        file: KtFile,
         private val filePartType: Type,
-        private val multifileClassFqName: FqName,
+        private val multifileClassType: Type,
         partContext: FieldOwnerContext<*>,
         state: GenerationState
-) : MemberCodegen<JetFile>(state, null, partContext, file, v) {
+) : MemberCodegen<KtFile>(state, null, partContext, file, v) {
     override fun generate() {
         if (state.classBuilderMode == ClassBuilderMode.LIGHT_CLASSES) return
         super.generate()
@@ -62,7 +58,7 @@ public class MultifileClassPartCodegen(
 
     override fun generateBody() {
         for (declaration in element.declarations) {
-            if (declaration is JetNamedFunction || declaration is JetProperty) {
+            if (declaration is KtNamedFunction || declaration is KtProperty) {
                 genFunctionOrProperty(declaration)
             }
         }
@@ -73,18 +69,14 @@ public class MultifileClassPartCodegen(
     }
 
     override fun generateKotlinAnnotation() {
-        if (state.classBuilderMode != ClassBuilderMode.FULL) {
-            return
-        }
-
         val members = ArrayList<DeclarationDescriptor>()
         for (declaration in element.declarations) {
             when (declaration) {
-                is JetNamedFunction -> {
+                is KtNamedFunction -> {
                     val functionDescriptor = bindingContext.get(BindingContext.FUNCTION, declaration)
                     members.add(functionDescriptor ?: throw AssertionError("Function ${declaration.name} is not bound in ${element.name}"))
                 }
-                is JetProperty -> {
+                is KtProperty -> {
                     val property = bindingContext.get(BindingContext.VARIABLE, declaration)
                     members.add(property ?: throw AssertionError("Property ${declaration.name} is not bound in ${element.name}"))
                 }
@@ -93,23 +85,18 @@ public class MultifileClassPartCodegen(
 
         val bindings = v.serializationBindings
 
-        val serializer = DescriptorSerializer.createTopLevel(JvmSerializerExtension(bindings, state.typeMapper))
+        val serializer = DescriptorSerializer.createTopLevel(
+                JvmSerializerExtension(bindings, state.typeMapper, state.useTypeTableInSerializer)
+        )
         val packageProto = serializer.packagePartProto(members).build()
 
-        if (packageProto.memberCount == 0) return
-
-        val strings = serializer.stringTable
-        val nameResolver = NameResolver(strings.serializeSimpleNames(), strings.serializeQualifiedNames())
-        val data = PackageData(nameResolver, packageProto)
-
         val av = v.newAnnotation(AsmUtil.asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_MULTIFILE_CLASS_PART), true)
-        JvmCodegenUtil.writeAbiVersion(av)
-        av.visit(JvmAnnotationNames.MULTIFILE_CLASS_NAME_FIELD_NAME, multifileClassFqName.shortName().asString())
-        val dataArray = av.visitArray(JvmAnnotationNames.DATA_FIELD_NAME)
-        for (string in BitEncoding.encodeBytes(SerializationUtil.serializePackageData(data))) {
-            dataArray.visit(null, string)
-        }
-        dataArray.visitEnd()
+        AsmUtil.writeAnnotationData(av, serializer, packageProto)
+        av.visit(JvmAnnotationNames.MULTIFILE_CLASS_NAME_FIELD_NAME, multifileClassType.internalName)
         av.visitEnd()
     }
-}
+
+    override fun generateSyntheticParts() {
+        generateSyntheticAccessors()
+    }
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java

@@ -24,9 +24,9 @@ import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorBase;
 import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl;
 import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorImpl;
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.resolve.scopes.JetScope;
+import org.jetbrains.kotlin.resolve.scopes.MemberScope;
 import org.jetbrains.kotlin.storage.LockBasedStorageManager;
-import org.jetbrains.kotlin.types.JetType;
+import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.kotlin.types.TypeConstructor;
 import org.jetbrains.kotlin.types.TypeConstructorImpl;
 import org.jetbrains.kotlin.types.TypeUtils;
@@ -41,7 +41,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
     private Visibility visibility;
     private TypeConstructor typeConstructor;
     private List<TypeParameterDescriptor> typeParameters;
-    private final Collection<JetType> supertypes = new ArrayList<JetType>();
+    private final Collection<KotlinType> supertypes = new ArrayList<KotlinType>();
 
     public MutableClassDescriptor(
             @NotNull DeclarationDescriptor containingDeclaration,
@@ -66,7 +66,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
     @NotNull
     @Override
     public Annotations getAnnotations() {
-        return Annotations.EMPTY;
+        return Annotations.Companion.getEMPTY();
     }
 
     public void setModality(@NotNull Modality modality) {
@@ -100,6 +100,11 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
         return isInner;
     }
 
+    @Override
+    public boolean isData() {
+        return false;
+    }
+
     @Override
     public boolean isCompanionObject() {
         return false;
@@ -111,10 +116,10 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
         return typeConstructor;
     }
 
-    public void addSupertype(@NotNull JetType supertype) {
+    public void addSupertype(@NotNull KotlinType supertype) {
         assert !supertype.isError() : "Error types must be filtered out in DescriptorResolver";
         if (TypeUtils.getClassDescriptor(supertype) != null) {
-            // See the Errors.SUPERTYPE_NOT_A_CLASS_OR_TRAIT
+            // See the Errors.SUPERTYPE_NOT_A_CLASS_OR_INTERFACE
             supertypes.add(supertype);
         }
     }
@@ -142,7 +147,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
         assert typeConstructor == null : typeConstructor;
         this.typeConstructor = TypeConstructorImpl.createForClass(
                 this,
-                Annotations.EMPTY,
+                Annotations.Companion.getEMPTY(),
                 !getModality().isOverridable(),
                 getName().asString(),
                 typeParameters,
@@ -155,14 +160,14 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
 
     @Override
     @NotNull
-    public JetScope getUnsubstitutedMemberScope() {
-        return JetScope.Empty.INSTANCE$; // used for getDefaultType
+    public MemberScope getUnsubstitutedMemberScope() {
+        return MemberScope.Empty.INSTANCE; // used for getDefaultType
     }
 
     @NotNull
     @Override
-    public JetScope getStaticScope() {
-        return JetScope.Empty.INSTANCE$;
+    public MemberScope getStaticScope() {
+        return MemberScope.Empty.INSTANCE;
     }
 
     @Override