Fix compilation

This reverts commit f8513abfa1.

(cherry picked from commit e53914d)

.gitignore

@@ -7,18 +7,17 @@
 /gh-pages
 /ideaSDK
 /android-studio/sdk
-/out
-/tmp
+out
+tmp
 workspace.xml
 *.versionsBackup
 /idea/testData/debugger/tinyApp/classes*
 /jps-plugin/testData/kannotator
-/ultimate/dependencies
-/ultimate/ideaSDK
-/ultimate/out
-/ultimate/tmp
-/js/js.translator/testData/**/out/
-.gradle/
-build/
-!**/src/**/build
-
+ultimate/.DS_Store
+ultimate/.idea/shelf
+ultimate/dependencies
+ultimate/ideaSDK
+ultimate/out
+ultimate/tmp
+ultimate/workspace.xml
+ultimate/*.versionsBackup

.idea/ant.xml

@@ -3,7 +3,7 @@
   <component name="AntConfiguration">
     <buildFile url="file://$PROJECT_DIR$/compiler/frontend/buildLexer.xml" />
     <buildFile url="file://$PROJECT_DIR$/build.xml">
-      <antCommandLine value="-J-ea" />
+      <antCommandLine value="-J-XX:MaxPermSize=100m -J-ea" />
       <maximumHeapSize value="1024" />
     </buildFile>
     <buildFile url="file://$PROJECT_DIR$/update_dependencies.xml" />

.idea/artifacts/KotlinJpsPlugin.xml

@@ -11,6 +11,7 @@
       <element id="directory" name="META-INF">
         <element id="dir-copy" path="$PROJECT_DIR$/jps-plugin/src/META-INF" />
       </element>
+      <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.2.jar" path-in-jar="/" />
       <element id="module-output" name="cli-common" />
       <element id="module-output" name="idea-jps-common" />
       <element id="module-output" name="jps-plugin" />

.idea/artifacts/KotlinPlugin.xml

@@ -10,7 +10,6 @@
     <root id="root">
       <element id="directory" name="lib">
         <element id="archive" name="kotlin-plugin.jar">
-          <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.2.jar" path-in-jar="/" />
           <element id="module-output" name="backend" />
           <element id="module-output" name="frontend" />
           <element id="module-output" name="descriptors" />
@@ -25,12 +24,11 @@
           <element id="module-output" name="js.parser" />
           <element id="module-output" name="cli-common" />
           <element id="module-output" name="idea-jps-common" />
-          <element id="module-output" name="build-common" />
           <element id="module-output" name="preloader" />
           <element id="module-output" name="deserialization" />
           <element id="module-output" name="backend-common" />
           <element id="library" level="project" name="builtins" />
-          <element id="module-output" name="js.ast" />
+          <element id="module-output" name="js.dart-ast" />
           <element id="directory" name="kotlin">
             <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/kotlin" />
             <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/kotlin" />
@@ -60,26 +58,27 @@
           <element id="module-output" name="backend.jvm" />
           <element id="module-output" name="ir.psi2ir" />
           <element id="module-output" name="annotation-based-compiler-plugins-ide-support" />
-          <element id="module-output" name="frontend.script" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">
           <element id="artifact" artifact-name="KotlinJpsPlugin" />
         </element>
         <element id="library" level="project" name="markdown" />
-        <element id="archive" name="android-extensions-ide.jar">
+        <element id="archive" name="kotlin-android-extensions-plugin.jar">
           <element id="module-output" name="android-extensions-idea" />
         </element>
-        <element id="archive" name="android-extensions-compiler.jar">
+        <element id="archive" name="kotlin-android-extensions-compiler-plugin.jar">
           <element id="module-output" name="android-extensions-compiler" />
-          <element id="module-output" name="android-extensions-runtime" />
         </element>
         <element id="archive" name="android-lint.jar">
           <element id="module-output" name="uast-kotlin" />
           <element id="module-output" name="lint-idea" />
+          <element id="module-output" name="uast-java" />
+          <element id="module-output" name="uast-common" />
           <element id="module-output" name="lint-checks" />
+          <element id="library" level="project" name="guava" />
           <element id="module-output" name="lint-api" />
-          <element id="module-output" name="uast-kotlin-idea" />
+          <element id="module-output" name="uast-android" />
         </element>
         <element id="archive" name="allopen-ide-plugin.jar">
           <element id="module-output" name="allopen-ide" />
@@ -93,20 +92,14 @@
         <element id="archive" name="noarg-ide-plugin.jar">
           <element id="module-output" name="noarg-ide" />
         </element>
-        <element id="file-copy" path="$PROJECT_DIR$/dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-script-runtime.jar" />
+        <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-daemon-client.jar" />
+        <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-script-runtime.jar" />
         <element id="archive" name="sam-with-receiver-compiler-plugin.jar">
           <element id="module-output" name="sam-with-receiver-cli" />
         </element>
         <element id="archive" name="sam-with-receiver-ide-plugin.jar">
           <element id="module-output" name="sam-with-receiver-ide" />
         </element>
-        <element id="archive" name="kotlin-gradle-tooling.jar">
-          <element id="module-output" name="kotlin-gradle-tooling" />
-        </element>
-        <element id="library" level="project" name="uast-java" />
-        <element id="library" level="project" name="kotlinx-coroutines-core" />
-        <element id="library" level="project" name="javaslang" />
-        <element id="library" level="project" name="kotlinx-coroutines-jdk8" />
       </element>
       <element id="directory" name="kotlinc">
         <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />

.idea/dictionaries/4u7.xml

@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="4u7">
-    <words>
-      <w>foldable</w>
-    </words>
-  </dictionary>
-</component>

.idea/dictionaries/Nikolay_Krasko.xml

@@ -2,7 +2,6 @@
   <dictionary name="Nikolay.Krasko">
     <words>
       <w>accessors</w>
-      <w>crossinline</w>
       <w>fqname</w>
       <w>goto</w>
       <w>gradle</w>

.idea/inspectionProfiles/idea_default.xml

@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
-  <profile version="1.0">
+  <profile version="1.0" is_locked="false">
     <option name="myName" value="idea.default" />
+    <option name="myLocal" value="false" />
     <inspection_tool class="AbstractMethodCallInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ArchaicSystemPropertyAccess" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AssignmentToForLoopParameter" enabled="true" level="WARNING" enabled_by_default="true">
@@ -235,6 +236,10 @@
       <scope name="idea openapi" level="WARNING" enabled="true" />
       <scope name="runtime.classes" level="ERROR" enabled="true" />
     </inspection_tool>
+    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
+      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
+    </inspection_tool>
     <inspection_tool class="LoopToCallChain" enabled="false" level="INFO" enabled_by_default="false" />
     <inspection_tool class="MethodMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_onlyPrivateOrFinal" value="false" />
@@ -342,12 +347,11 @@
         <constraint name="__context__" script="&quot;&quot;" within="" contains="" />
       </searchConfiguration>
     </inspection_tool>
-    <inspection_tool class="SameParameterValue" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="SetReplaceableByEnumSet" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SetupCallsSuperSetup" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SetupIsPublicVoidNoArg" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SimplifiableIfStatement" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="Since15" enabled="false" level="ERROR" enabled_by_default="false">
+    <inspection_tool class="Since15" enabled="true" level="ERROR" enabled_by_default="true">
       <scope name="IDEA Test Sources" level="ERROR" enabled="false" />
     </inspection_tool>
     <inspection_tool class="SocketResource" enabled="true" level="WARNING" enabled_by_default="true">

.idea/kotlinc.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="KotlinCommonCompilerArguments">
-    <option name="languageVersion" value="1.1" />
-    <option name="apiVersion" value="1.1" />
-  </component>
   <component name="KotlinCompilerSettings">
     <option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
   </component>

.idea/libraries/Rhino.xml

@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="Rhino">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/rhino-1.7.6.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/rhino-1.7.6-sources.jar!/rhino1.7.6/src" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/android_layoutlib.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="android-layoutlib">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/android/lib/layoutlib.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/android_plugin.xml

@@ -6,6 +6,7 @@
     <CLASSES>
       <root url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib" />
       <root url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib/jps" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/android-common.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

.idea/libraries/asm.xml

@@ -8,7 +8,7 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/asm-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/cli_parser.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="cli-parser">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/coverage_plugin.xml

@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/coverage/lib/coverage.jar!/" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/coverage/lib/jacocoant.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/coverage/lib/coverage-agent.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

.idea/libraries/guava.xml

@@ -4,11 +4,11 @@
       <root url="file://$PROJECT_DIR$/annotations" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/guava-19.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/guava-17.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/guava-19.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/idea_full.xml

@@ -9,9 +9,9 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/guava-19.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/asm-src.zip!/" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />
   </library>

.idea/libraries/intellij_core.xml

@@ -5,27 +5,14 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/annotations.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/asm-all.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/guava-19.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/intellij-core.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/jdom.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/jna.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/log4j.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/picocontainer.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/snappy-in-java-0.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/trove4j.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/util.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/xpp3-1.1.4-min.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/core/xstream-1.4.8.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/jsr305.jar!/" />
+      <root url="file://$PROJECT_DIR$/ideaSDK/core" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/guava-19.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/asm-src.zip!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/jsr305.jar!/" />
     </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/core" recursive="false" />
   </library>
 </component>

.idea/libraries/intellij_core_analysis.xml

@@ -0,0 +1,17 @@
+<component name="libraryTable">
+  <library name="intellij-core-analysis">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/annotations" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/core-analysis/intellij-core-analysis.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/javaslang.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="javaslang">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/javaslang-2.0.6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/javaslang-2.0.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/jps.xml

@@ -9,6 +9,17 @@
     <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/antLayout/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/jps-builders/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/jps-builders/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/jps-launcher/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/model-api/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/model-impl/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/model-impl/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/model-serialization/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/model-serialization/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/plugin-system/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/jps/standalone-builder/src" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps" recursive="false" />
   </library>

.idea/libraries/json_org.xml

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

.idea/libraries/kotlin_reflect.xml

@@ -4,9 +4,6 @@
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="file://$PROJECT_DIR$/core/reflection.jvm/src" />
-      <root url="file://$PROJECT_DIR$/core/descriptors.runtime/src" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/kotlin_test.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="kotlin-test">
     <CLASSES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/"/>
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="file://$PROJECT_DIR$/libraries/kotlin.test/shared/src/main/kotlin" />
+      <root url="file://$PROJECT_DIR$/libraries/kotlin.test/shared/src/main/kotlin.jvm" />
       <root url="file://$PROJECT_DIR$/libraries/kotlin.test/junit/src/main/kotlin" />
-      <root url="file://$PROJECT_DIR$/libraries/kotlin.test/common/src/main/kotlin" />
-      <root url="file://$PROJECT_DIR$/libraries/kotlin.test/jvm/src/main/kotlin" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/kotlinx_coroutines_core.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="kotlinx-coroutines-core">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-core.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-core-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/kotlinx_coroutines_jdk8.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="kotlinx-coroutines-jdk8">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-jdk8.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-jdk8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/properties.xml

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

.idea/libraries/trove4j.xml

@@ -7,6 +7,11 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/lib/trove4j.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <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/libraries/uast_java.xml

@@ -1,15 +0,0 @@
-<component name="libraryTable">
-  <library name="uast-java">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/uast-common.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/uast-java.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/uast-tests.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/uast-common-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/uast-java-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/uast-tests-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/misc.xml

@@ -6,6 +6,7 @@
     </properties>
   </component>
   <component name="EntryPointsManager">
+    <entry_points version="2.0" />
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="javax.inject.Inject" />
     </list>
@@ -48,7 +49,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SuppressABINotification">

.idea/modules.xml

@@ -9,11 +9,11 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml" group="plugins/android-extensions" />
       <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml" group="plugins/android-extensions" />
       <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml" group="plugins/android-extensions" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml" group="plugins/android-extensions" />
       <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml" filepath="$PROJECT_DIR$/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" filepath="$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/annotation-processing/annotation-processing.iml" filepath="$PROJECT_DIR$/plugins/annotation-processing/annotation-processing.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/ant/ant.iml" filepath="$PROJECT_DIR$/ant/ant.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
@@ -41,7 +41,6 @@
       <module fileurl="file://$PROJECT_DIR$/idea/formatter/formatter.iml" filepath="$PROJECT_DIR$/idea/formatter/formatter.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/frontend.script/frontend.script.iml" filepath="$PROJECT_DIR$/compiler/frontend.script/frontend.script.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
       <module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/idea/ide-common/ide-common.iml" filepath="$PROJECT_DIR$/idea/ide-common/ide-common.iml" group="ide" />
@@ -63,11 +62,10 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" group="compiler/ir" />
       <module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" group="compiler/ir" />
       <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/javac-wrapper/javac-wrapper.iml" filepath="$PROJECT_DIR$/compiler/javac-wrapper/javac-wrapper.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/java-model-wrappers/java-model-wrappers.iml" filepath="$PROJECT_DIR$/plugins/java-model-wrappers/java-model-wrappers.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-tests/jps-tests.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-tests/jps-tests.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.ast/js.ast.iml" filepath="$PROJECT_DIR$/js/js.ast/js.ast.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.dce/js.dce.iml" filepath="$PROJECT_DIR$/js/js.dce/js.dce.iml" group="compiler/js" />
+      <module fileurl="file://$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" filepath="$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.frontend/js.frontend.iml" filepath="$PROJECT_DIR$/js/js.frontend/js.frontend.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.inliner/js.inliner.iml" filepath="$PROJECT_DIR$/js/js.inliner/js.inliner.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.parser/js.parser.iml" filepath="$PROJECT_DIR$/js/js.parser/js.parser.iml" group="compiler/js" />
@@ -75,14 +73,13 @@
       <module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" filepath="$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/kapt3/kapt3.iml" filepath="$PROJECT_DIR$/plugins/kapt3/kapt3.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml" filepath="$PROJECT_DIR$/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/kapt3/kapt3.iml" filepath="$PROJECT_DIR$/plugins/kapt3/kapt3.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/light-classes/light-classes.iml" filepath="$PROJECT_DIR$/compiler/light-classes/light-classes.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-api/lint-api.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-api/lint-api.iml" group="plugins/lint" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-checks/lint-checks.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-checks/lint-checks.iml" group="plugins/lint" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-idea/lint-idea.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-idea/lint-idea.iml" group="plugins/lint" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/noarg/noarg-cli/noarg-cli.iml" filepath="$PROJECT_DIR$/plugins/noarg/noarg-cli/noarg-cli.iml" group="plugins/noarg" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/noarg/noarg-ide/noarg-ide.iml" filepath="$PROJECT_DIR$/plugins/noarg/noarg-ide/noarg-ide.iml" group="plugins/noarg" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/noarg/noarg-cli/noarg-cli.iml" filepath="$PROJECT_DIR$/plugins/noarg/noarg-cli/noarg-cli.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/noarg/noarg-ide/noarg-ide.iml" filepath="$PROJECT_DIR$/plugins/noarg/noarg-ide/noarg-ide.iml" />
       <module fileurl="file://$PROJECT_DIR$/non-compiler-tests/non-compiler-tests.iml" filepath="$PROJECT_DIR$/non-compiler-tests/non-compiler-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" filepath="$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/plugins-tests/plugins-tests.iml" filepath="$PROJECT_DIR$/plugins/plugins-tests/plugins-tests.iml" group="plugins" />
@@ -90,15 +87,15 @@
       <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/resolution/resolution.iml" filepath="$PROJECT_DIR$/compiler/resolution/resolution.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml" filepath="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml" group="plugins/sam-with-receiver" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml" filepath="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml" group="plugins/sam-with-receiver" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml" filepath="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml" filepath="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/script.runtime/script.runtime.iml" filepath="$PROJECT_DIR$/core/script.runtime/script.runtime.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/serialization/serialization.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml" filepath="$PROJECT_DIR$/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests-common/tests-common.iml" filepath="$PROJECT_DIR$/compiler/tests-common/tests-common.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests-ir-jvm/tests-ir-jvm.iml" filepath="$PROJECT_DIR$/compiler/tests-ir-jvm/tests-ir-jvm.iml" group="compiler/ir" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/uast-common/uast-common.iml" filepath="$PROJECT_DIR$/plugins/uast-common/uast-common.iml" group="plugins/lint" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/uast-java/uast-java.iml" filepath="$PROJECT_DIR$/plugins/uast-java/uast-java.iml" group="plugins/lint" />
       <module fileurl="file://$PROJECT_DIR$/plugins/uast-kotlin/uast-kotlin.iml" filepath="$PROJECT_DIR$/plugins/uast-kotlin/uast-kotlin.iml" group="plugins/lint" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/uast-kotlin-idea/uast-kotlin-idea.iml" filepath="$PROJECT_DIR$/plugins/uast-kotlin-idea/uast-kotlin-idea.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
     </modules>

.idea/runConfigurations/All_IDEA_Plugin_Tests.xml

@@ -13,7 +13,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1250m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m  -Djna.nosys=true" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1250m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m  -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/All_Jvm_Backend_Tests.xml

@@ -13,7 +13,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m  -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/All_Non_Compiler_Tests.xml

@@ -13,7 +13,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true -Dkotlin.colors.enabled=false" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1100m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/All_in_jps_tests.xml

@@ -8,7 +8,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=128m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin  -Djna.nosys=true" />
+    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=64m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin  -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/Codegen_Tests_on_Android.xml

@@ -3,7 +3,7 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="android-tests" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH" value="1.6" />
     <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.android.tests" />
     <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.android.tests.AndroidRunner" />
     <option name="METHOD_NAME" value="" />

.idea/runConfigurations/Codegen_Tests_with_JVM_target_1_6_on_JDK_1_6.xml

@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Codegen Tests with JVM target 1.6 on JDK 1.6" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="compiler-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.6 -Dkotlin.test.box.in.separate.process.port=5100 -Dkotlin.test.java.compilation.target=1.6 -ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Codegen_Tests_with_JVM_target_1_6_on_JDK_9.xml

@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Codegen Tests with JVM target 1.6 on JDK 9" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="compiler-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="9-ea" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.6 -ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Codegen_Tests_with_JVM_target_1_8_on_JDK_1_8.xml

@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Codegen Tests with JVM target 1.8 on JDK 1.8" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="compiler-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.8  -ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Codegen_Tests_with_JVM_target_1_8_on_JDK_9.xml

@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Codegen Tests with JVM target 1.8 on JDK 9" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="compiler-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="9-ea" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.8 -ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Codegen_Tests_with_JVM_target_9_on_JDK_9_.xml

@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Codegen Tests with JVM target 9 on JDK 9 " type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.codegen.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="compiler-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="9-ea" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-Dkotlin.test.default.jvm.target=1.8 -Dkotlin.test.substitute.bytecode.1.8.to.1.9=true -ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Compiler_Tests.xml

@@ -13,7 +13,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true -Dkotlin.colors.enabled=false" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx700m -XX:MaxPermSize=300m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m  -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/IDEA.xml

@@ -1,9 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="IDEA" type="Application" factoryName="Application" singleton="true">
-    <log_file path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" checked="true" skipped="true" show_all="false" alias="idea.log" />
     <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="-Xmx1250m -XX:ReservedCodeCacheSize=128m -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="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=64m -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" />

.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml

@@ -1,9 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
-    <log_file path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" checked="true" skipped="true" show_all="false" alias="idea.log" />
     <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="-Xmx1250m -XX:ReservedCodeCacheSize=128m -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" />
+    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=64m -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" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

.idea/runConfigurations/Java_8_Tests.xml

@@ -13,7 +13,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m  -Djna.nosys=true -Dkotlin.colors.enabled=false" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m  -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/Java_8_Tests_on_JDK_9.xml

@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Java 8 Tests on JDK 9" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="compiler-tests-java8" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="9-ea" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Djna.nosys=true --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Js_backend_tests.xml

@@ -8,7 +8,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1250m -XX:+UseCodeCacheFlushing -Djna.nosys=true -Dkotlin.js.skipMinificationTest=false" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1250m -XX:+UseCodeCacheFlushing -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

Kotlin.iml

@@ -14,73 +14,37 @@
       <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system" />
       <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system-idea" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/annotation-processor-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/browser-example-with-library/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/docs/apidoc/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/docs/website/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/examples/browser-example/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/examples/js-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-gradle-subplugin-example/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-java-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-js-library-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-jsr223-daemon-local-eval-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-jsr223-local-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/common/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/js/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/js/it/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/js/it/node_modules" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/junit/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/jvm/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/common/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/jre7/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/jre8/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/js/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/js/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin-jdbc/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin-swing/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/kunit/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/validator/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/binary-compatibility-validator/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/gradle-tools/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/idl2k/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-allopen/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-allopen/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-android-extensions/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-annotation-processing-maven/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-annotation-processing/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-build-common-test/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler-client-embeddable-test/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler-client-embeddable/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler-embeddable/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler-runner/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kdoc-maven-plugin/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kdoc/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-daemon-client/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-api/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-api/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-integration-tests/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-integration-tests/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin/build" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-core/local-repo" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-core/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-test/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin/local-repo" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-allopen/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-noarg/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-library/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-tests-junit/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-tests/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin-test/local-repo" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin-test/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/local-repo" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-noarg/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-noarg/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-osgi-bundle/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-reflect/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-sam-with-receiver-compiler-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-script-util/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-source-sections-compiler-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-stdlib-gen/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/maven-archetypes/kotlin-archetype-js/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/maven-archetypes/kotlin-archetype-jvm/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/native-platform/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/protobuf-lite/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/runtime/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/script-runtime/build" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-reflect/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-stdlib-gen/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/runtime/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

ReadMe.md

@@ -1,27 +1,27 @@
-<a href="http://slack.kotlinlang.org/"><img src="http://slack.kotlinlang.org/badge.svg" height="20"></a>
+<a href="http://kotlinslackin.herokuapp.com"><img src="https://kotlinslackin.herokuapp.com/badge.svg" height="20"></a>
 [![TeamCity (simple build status)](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/bt345.svg)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=bt345&branch_Kotlin=%3Cdefault%3E&tab=buildTypeStatusDiv)
 [![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlin/kotlin-maven-plugin.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.jetbrains.kotlin%22)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
 
 # Kotlin Programming Language
 
-Welcome to [Kotlin](https://kotlinlang.org/)! Some handy links:
+Welcome to [Kotlin](http://kotlinlang.org/)! Some handy links:
 
- * [Kotlin Site](https://kotlinlang.org/)
- * [Getting Started Guide](https://kotlinlang.org/docs/tutorials/getting-started.html)
- * [Try Kotlin](https://try.kotlinlang.org/)
- * [Kotlin Standard Library](https://kotlinlang.org/api/latest/jvm/stdlib/index.html)
- * [Issue Tracker](https://youtrack.jetbrains.com/issues/KT)
- * [Forum](https://discuss.kotlinlang.org/)
- * [Kotlin Blog](https://blog.jetbrains.com/kotlin/)
+ * [Kotlin Site](http://kotlinlang.org/)
+ * [Getting Started Guide](http://kotlinlang.org/docs/tutorials/getting-started.html)
+ * [Try Kotlin](http://try.kotlinlang.org/)
+ * [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://slack.kotlinlang.org/)
+ * [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](https://kotlinlang.org/docs/tutorials/getting-started.html)
- * [Kotlin Eclipse Plugin](https://kotlinlang.org/docs/tutorials/getting-started-eclipse.html)
+ * [Kotlin Eclipse Plugin](http://kotlinlang.org/docs/tutorials/getting-started-eclipse.html)
  * [Kotlin TextMate Bundle](https://github.com/vkostyukov/kotlin-sublime-package)
 
 ## Build environment requirements
@@ -32,7 +32,7 @@ In order to build Kotlin distribution you need to have:
 - JDK 1.6, 1.7 and 1.8
 - Setup environment variables as following:
 
-        JAVA_HOME="path to JDK 1.8"
+        JAVA_HOME="path to JDK 1.6"
         JDK_16="path to JDK 1.6"
         JDK_17="path to JDK 1.7"
         JDK_18="path to JDK 1.8"
@@ -45,49 +45,65 @@ To build this project, first time you try to build you need to run this:
 
 which will setup the dependencies on
 
-* `intellij-core` is a part of command line compiler and contains only necessary APIs.
-* `idea-full` is a full blown IntelliJ IDEA Community Edition to be used in the plugin module.
+* intellij-core: is a part of command line compiler and contains only necessary APIs.
+* idea-full: is a full blown IntelliJ IDEA Community Edition to be used in former plugin module.
 
 Then, you need to run
 
     ant -f build.xml
 
-which will build the binaries of the compiler and put them into the `dist` directory. You may need to increase the **heap size** for Ant using
-[ANT_OPTS](https://web.liferay.com/community/wiki/-/wiki/Main/Ant+opts).
+which will build the binaries of the compiler and put them into the 'dist' directory. You may need to increase the **heap size** for Ant using
+[ANT_OPTS](http://www.liferay.com/community/wiki/-/wiki/Main/Ant+opts).
 
-**OPTIONAL:** Maven artifact distribution is built separately, go into `libraries` directory after building the compiler and run:
+**OPTIONAL:** Maven distribution is built separately, run
 
-    ./gradlew build install
-    mvn install
+    mvn package
 
-> Note: on Windows type `gradlew` without the leading `./`
-
-Refer to [libraries/ReadMe.md](libraries/ReadMe.md) for details.
+from 'libraries' directory after building the compiler. Refer to [libraries/ReadMe.md](libraries/ReadMe.md) for details.
 
 ## Working with the project in IntelliJ IDEA
 
 The [root kotlin project](https://github.com/JetBrains/kotlin) already has an IntelliJ IDEA project, you can just open it in IntelliJ IDEA.
 
-You may need to set the Project SDK (`File -> Project Structure -> Project`).
-You may also need to add `tools.jar` to your SDK: 
-    
-    File -> Project Structure -> SDKs -> <Your JDK> -> Classpath
-
+You may need to set the Project SDK (File -> Project Structure -> Project).
+You may also need to add `tools.jar` to your SDK: File -> Project Structure -> SDKs -> <Your JDK> -> Classpath,
 then choose the `tools.jar` in the JDK's `lib` directory.
 
 If you are not dealing with Android, you may need to disable the Android Plugin in order to compile the project.
 
-### <a name="installing-plugin"></a> Installing the latest Kotlin plugin
-
 Since Kotlin project contains code written in Kotlin itself, you will also need a Kotlin plugin to build the project in IntelliJ IDEA.
+To keep the plugin version in sync with the rest of the team and our [Continuous Integration server](https://teamcity.jetbrains.com/project.html?projectId=Kotlin&tab=projectOverview)
+you should install the according to the [instructions below](#plugin-for-contributors).
 
-You probably want to have locally the same version of plugin that build server is using for building.
+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 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
+
+* VCS -> Git -> Pull
+* Run IntelliJ IDEA
+* a child IntelliJ IDEA with the Kotlin plugin will then startup
+* you can now open the [kotlin libraries project](https://github.com/JetBrains/kotlin/tree/master/libraries) to then work with the various kotlin libraries etc.
+
+### <a name="pre-built-plugin"></a>Using a pre-built Kotlin IntelliJ IDEA plugin
+
+There are several options for getting Kotlin plugin. A stable version can be obtained as any other plugin for IntelliJ IDEA:
+
+    Preferences -> Plugins -> Install JetBrains plugin... -> Search with "Kotlin" string
+
+The most recent version of the plugin can be downloaded from the
+[IDEA Plugin and Tests CI build](https://teamcity.jetbrains.com/project.html?projectId=project67&tab=projectOverview). When downloading is
+finished you can install it with "Install plugin from disk...":
+
+    Preferences -> Plugins -> Install plugin from disk...
+
+You can now open any Kotlin based projects.
+
+<a name="plugin-for-contributors"></a>
+**Note for contributors**: If you are planning to contribute to Kotlin project you probably want to have locally the same version of plugin that build server is using for building.
 As this version is constantly moving, the best way to always be updated is to let IntelliJ IDEA notify you when it is time to renew your plugin.
 
-To keep the plugin version in sync with the rest of the team and our [Continuous Integration server](https://teamcity.jetbrains.com/project.html?projectId=Kotlin&tab=projectOverview)
-you should setup IDEA to update the plugin directly from the build server.
-
-Open:
+Open
 
     Preferences -> Plugins -> Browse Repositories -> Manage Repositories...
 
@@ -97,22 +113,10 @@ and add the following URL to your repositories:
 
 Then update the list of plugins in "Browse Repositories", you'll see two versions of Kotlin there, install the one with the higher version number.
 
-If you want to keep an IntelliJ IDEA installation with that bleeding edge Kotlin plugin for working Kotlin project sources only separate to your default IntelliJ IDEA installation with the stable Kotlin
-plugin [see this document](https://intellij-support.jetbrains.com/hc/en-us/articles/207240985-Changing-IDE-default-directories-used-for-config-plugins-and-caches-storage), which describes how to have multiple IntelliJ IDEA installations using different configurations and plugin directories.
-
-### Compiling and running
-
-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
-
-* VCS -> Git -> Pull
-* Run IntelliJ IDEA
-* a child IntelliJ IDEA with the Kotlin plugin will then startup
-* you can now open the [kotlin libraries project](https://github.com/JetBrains/kotlin/tree/master/libraries) to then work with the various kotlin libraries etc.
-
 # Contributing
 
-We love contributions! There's [lots to do on Kotlin](https://youtrack.jetbrains.com/issues/KT) and on the
-[standard library](https://youtrack.jetbrains.com/issues/KT?q=%23Kotlin%20%23Unresolved%20and%20(links:%20KT-2554,%20KT-4089%20or%20%23Libraries)) so why not chat with us
+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.
 
@@ -120,12 +124,12 @@ If you want to find some issues to start off with, try [this query](https://yout
 
 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 [standard library docs](https://kotlinlang.org/api/latest/jvm/stdlib/index.html)
+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
-[`hashMapOf()`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/hash-map-of.html) function.
-This is implemented using the [`@sample`](https://github.com/JetBrains/kotlin/blob/1.1.0/libraries/stdlib/src/kotlin/collections/Maps.kt#L91)
+[`hashMapOf()`](http://kotlinlang.org/api/latest/jvm/stdlib/kotlin/hash-map-of.html) function.
+This is implemented using the [`@sample`](https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/src/kotlin/collections/Maps.kt#L64)
 macro to include code from a test function. The benefits of this approach are twofold; First, the API's documentation is improved via beneficial examples that help new users and second, the code coverage is increased.
 
 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.
@@ -135,8 +139,8 @@ Also the [JavaScript translation](https://github.com/JetBrains/kotlin/blob/maste
 
 The Kotlin compiler is written in Java and Kotlin (we gradually migrate more and more of it to pure Kotlin). So the easiest way to work on the compiler or IntelliJ IDEA plugin is
 
-* download a recent [IntelliJ IDEA](https://www.jetbrains.com/idea/?fromMenu#chooseYourEdition), Community edition is enough
-* [install the Kotlin plugin](#installing-plugin)
+* download a clean [IDEA 15 EAP build](https://confluence.jetbrains.com/display/IDEADEV/IDEA+15+EAP)
+* [install the Kotlin plugin](#pre-built-plugin)
 * open the [root kotlin project](https://github.com/JetBrains/kotlin) in IDEA (opening the kotlin directory)
 
 You can now run the various Run/Debug Configurations such as
@@ -148,35 +152,29 @@ You can now run the various Run/Debug Configurations such as
 
 ## If you want to work on the Kotlin libraries
 
-* download a recent [IntelliJ IDEA](https://www.jetbrains.com/idea/?fromMenu#chooseYourEdition), Community edition is enough
-* [install the Kotlin plugin](#installing-plugin)
+* download a clean [IDEA 15 EAP build](https://confluence.jetbrains.com/display/IDEADEV/IDEA+15+EAP)
+* [install the Kotlin plugin](#pre-built-plugin)
 * open the [kotlin libraries project](https://github.com/JetBrains/kotlin/tree/master/libraries)
 
 Then build via
 
     cd libraries
-    ./gradlew build install
     mvn install
-    
-> Note: on Windows type `gradlew` without the leading `./`
 
-Some of the code in the standard library is created by generating code from templates. See the [README](libraries/stdlib/ReadMe.md) in the stdlib section for how run the code generator. The existing templates can be used as examples for creating new ones.
+Some of the code in the standard library is created by generating code from templates. See the [README](https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/ReadMe.md) in the stdlib section for how run the code generator. The existing templates can be used as examples for creating new ones.
 
 ## Submitting patches
 
-The best way to submit a patch is to [fork the project on github](https://help.github.com/articles/fork-a-repo/) then send us a
-[pull request](https://help.github.com/articles/creating-a-pull-request/) via [github](https://github.com).
+The best way to submit a patch is to [fork the project on github](http://help.github.com/fork-a-repo/) then send us a
+[pull request](https://help.github.com/articles/creating-a-pull-request/) via [github](http://github.com).
 
 If you create your own fork, it might help to enable rebase by default
-when you pull by executing
-``` bash
-git config --global pull.rebase true
-```
-This will avoid your local repo having too many merge commits
+when you pull by executing `git config --global pull.rebase
+true`. This will avoid your local repo having too many merge commits
 which will help keep your pull request simple and easy to apply.
 
 ## Commit comments
 
-If you include in your comment this text (where KT-1234 is the Issue ID in the [Issue Tracker](https://youtrack.jetbrains.com/issues/KT)), the issue will get automatically marked as fixed.
+If you include in your comment this text (where KT-1234 is the Issue ID in the [Issue Tracker](http://youtrack.jetbrains.com/issues/KT), the issue will get automatically marked as fixed.
 
     #KT-1234 Fixed

TeamCityBuild.xml

@@ -17,7 +17,6 @@
     <property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinCompilerVersion.java.bk"/>
     <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned"/>
     <property name="compiler.version.number" value="${build.number}"/>
-    <property name="compiler.ant.fork.jvmargs" value="-Xmx1024m"/>
 
     <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
 
@@ -146,13 +145,13 @@
     </macrodef>
 
     <target name="printStatistics">
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib.jar"/>
+        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-runtime.jar"/>
         <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/>
 
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib-js.jar"/>
+        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-jslib.jar"/>
         <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin.js"/>
-        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin-test.js"/>
-        <print-file-size-statistic path="${basedir}/libraries/stdlib/js/build/classes/main" file-name="kotlin.meta.js"/>
+        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="${compiled.stdlib.meta.js}"/>
+        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="${compiled.stdlib.js}"/>
     </target>
 
     <target name="post_build" depends="zipArtifacts, revertTemplateFiles, printStatistics, remove_internal_artifacts, dont_remove_internal_artifacts"/>

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

@@ -22,7 +22,7 @@ import java.io.File
 class Kotlin2JsTask : KotlinCompilerBaseTask() {
     override val compilerFqName = "org.jetbrains.kotlin.cli.js.K2JSCompiler"
 
-    var libraries: Path? = null
+    var library: Path? = null
     var outputPrefix: File? = null
     var outputPostfix: File? = null
     var sourceMap: Boolean = false
@@ -35,9 +35,15 @@ class Kotlin2JsTask : KotlinCompilerBaseTask() {
      */
     var main: String? = null
 
-    fun createLibraries(): Path {
-        val libraryPaths = libraries ?: return Path(getProject()).also { libraries = it }
-        return libraryPaths.createPath()
+    fun createLibrary(): Path {
+        val libraryPath = library
+        if (libraryPath == null) {
+            val t = Path(getProject())
+            library = t
+            return t
+        }
+
+        return libraryPath.createPath()
     }
 
     override fun fillSpecificArguments() {
@@ -45,9 +51,9 @@ class Kotlin2JsTask : KotlinCompilerBaseTask() {
         args.add(output!!.canonicalPath)
 
         // TODO: write test
-        libraries?.let {
-            args.add("-libraries")
-            args.add(it.list().joinToString(File.pathSeparator) { File(it).canonicalPath })
+        library?.let {
+            args.add("-library-files")
+            args.add(it.list().joinToString(separator = ",") { File(it).canonicalPath })
         }
 
         outputPrefix?.let {

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

@@ -29,8 +29,8 @@ internal object KotlinAntTaskUtil {
 
     private val libPath: File by lazy {
         // Find path of kotlin-ant.jar in the filesystem and find kotlin-compiler.jar in the same directory
-        val resourcePath = "/" + this::class.java.name.replace('.', '/') + ".class"
-        val jarConnection = this::class.java.getResource(resourcePath).openConnection() as? JarURLConnection
+        val resourcePath = "/" + javaClass.name.replace('.', '/') + ".class"
+        val jarConnection = javaClass.getResource(resourcePath).openConnection() as? JarURLConnection
                             ?: throw UnsupportedOperationException("Kotlin compiler Ant task should be loaded from the JAR file")
         val antTaskJarPath = File(jarConnection.jarFileURL.toURI())
 
@@ -54,7 +54,7 @@ internal object KotlinAntTaskUtil {
         val cached = classLoaderRef.get()
         if (cached != null) return cached
 
-        val myLoader = this::class.java.classLoader
+        val myLoader = javaClass.classLoader
         if (myLoader !is AntClassLoader) return myLoader
 
         val classLoader = ClassPreloadingUtils.preloadClasses(listOf(compilerJar), Preloader.DEFAULT_CLASS_NUMBER_ESTIMATE, myLoader, null)

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

@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.ant
 
 import org.apache.tools.ant.BuildException
 import org.apache.tools.ant.MagicNames
-import org.apache.tools.ant.Project.MSG_ERR
 import org.apache.tools.ant.Project.MSG_WARN
 import org.apache.tools.ant.taskdefs.compilers.Javac13
 import org.apache.tools.ant.taskdefs.condition.AntVersion
@@ -45,11 +44,6 @@ class KotlinCompilerAdapter : Javac13() {
 
     @Throws(BuildException::class)
     override fun execute(): Boolean {
-        if (javac.isForkedJavac) {
-            javac.log("<withKotlin> task does not yet support the fork mode", MSG_ERR)
-            return false
-        }
-
         val javac = javac
 
         checkAntVersion()

build-common/build-common.iml

@@ -14,6 +14,5 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="tests-common" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>

build-common/src/org/jetbrains/kotlin/build/JvmBuildMetaInfo.kt

@@ -1,75 +0,0 @@
-/*
- * Copyright 2010-2017 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.build
-
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.config.ApiVersion
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
-import org.jetbrains.kotlin.config.LanguageVersion
-import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion
-import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
-
-/**
- * If you want to add a new field, check its type is supported by [serializeToPlainText], [deserializeFromPlainText]
- */
-data class JvmBuildMetaInfo(
-        val isEAP: Boolean,
-        val compilerBuildVersion: String,
-        val languageVersionString: String,
-        val apiVersionString: String,
-        val coroutinesEnable: Boolean,
-        val coroutinesWarn: Boolean,
-        val coroutinesError: Boolean,
-        val multiplatformEnable: Boolean,
-        val metadataVersionMajor: Int,
-        val metadataVersionMinor: Int,
-        val metadataVersionPatch: Int,
-        val bytecodeVersionMajor: Int,
-        val bytecodeVersionMinor: Int,
-        val bytecodeVersionPatch: Int,
-        val ownVersion: Int = JvmBuildMetaInfo.OWN_VERSION,
-        val coroutinesVersion: Int = JvmBuildMetaInfo.COROUTINES_VERSION,
-        val multiplatformVersion: Int = JvmBuildMetaInfo.MULTIPLATFORM_VERSION
-) {
-    companion object {
-        const val OWN_VERSION: Int = 0
-        const val COROUTINES_VERSION: Int = 0
-        const val MULTIPLATFORM_VERSION: Int = 0
-
-        fun serializeToString(info: JvmBuildMetaInfo): String =
-                serializeToPlainText(info)
-
-        fun deserializeFromString(str: String): JvmBuildMetaInfo? =
-                deserializeFromPlainText(str)
-    }
-}
-
-fun JvmBuildMetaInfo(args: CommonCompilerArguments): JvmBuildMetaInfo =
-        JvmBuildMetaInfo(isEAP = KotlinCompilerVersion.isPreRelease(),
-                         compilerBuildVersion = KotlinCompilerVersion.VERSION,
-                         languageVersionString = args.languageVersion ?: LanguageVersion.LATEST_STABLE.versionString,
-                         apiVersionString = args.apiVersion ?: ApiVersion.LATEST_STABLE.versionString,
-                         coroutinesEnable = args.coroutinesState == CommonCompilerArguments.ENABLE,
-                         coroutinesWarn = args.coroutinesState == CommonCompilerArguments.WARN,
-                         coroutinesError = args.coroutinesState == CommonCompilerArguments.ERROR,
-                         multiplatformEnable = args.multiPlatform,
-                         metadataVersionMajor = JvmMetadataVersion.INSTANCE.major,
-                         metadataVersionMinor = JvmMetadataVersion.INSTANCE.minor,
-                         metadataVersionPatch = JvmMetadataVersion.INSTANCE.patch,
-                         bytecodeVersionMajor = JvmBytecodeBinaryVersion.INSTANCE.major,
-                         bytecodeVersionMinor = JvmBytecodeBinaryVersion.INSTANCE.minor,
-                         bytecodeVersionPatch = JvmBytecodeBinaryVersion.INSTANCE.patch)

build-common/src/org/jetbrains/kotlin/build/serializationUtils.kt

@@ -1,71 +0,0 @@
-/*
- * Copyright 2010-2017 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.build
-
-import kotlin.reflect.KClass
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.full.primaryConstructor
-
-inline fun <reified T : Any> serializeToPlainText(instance: T): String = serializeToPlainText(instance, T::class)
-
-fun <T : Any> serializeToPlainText(instance: T, klass: KClass<T>): String {
-    val lines = ArrayList<String>()
-    for (property in klass.memberProperties) {
-        val value = property.get(instance)
-        if (value != null) {
-            lines.add("${property.name}=$value")
-        }
-    }
-    return lines.joinToString("\n")
-}
-
-inline fun <reified T : Any> deserializeFromPlainText(str: String): T? = deserializeFromPlainText(str, T::class)
-
-fun <T : Any> deserializeFromPlainText(str: String, klass: KClass<T>): T? {
-    val args = ArrayList<Any?>()
-    val properties = str
-            .split("\n")
-            .filter(String::isNotBlank)
-            .associate { it.substringBefore("=") to it.substringAfter("=") }
-
-    val primaryConstructor = klass.primaryConstructor
-                             ?: throw IllegalStateException("${klass.java} does not have primary constructor")
-    for (param in primaryConstructor.parameters.sortedBy { it.index }) {
-        val argumentString = properties[param.name]
-
-        if (argumentString == null) {
-            if (param.type.isMarkedNullable) {
-                args.add(null)
-                continue
-            }
-            else {
-                return null
-            }
-        }
-
-        val argument: Any? = when (param.type.classifier) {
-            Int::class -> argumentString.toInt()
-            Boolean::class -> argumentString.toBoolean()
-            String::class -> argumentString
-            else -> throw IllegalStateException("Unexpected property type: ${param.type}")
-        }
-
-        args.add(argument)
-    }
-
-    return primaryConstructor.call(*args.toTypedArray())
-}

build-common/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java

@@ -16,33 +16,32 @@
 
 package org.jetbrains.kotlin.compilerRunner;
 
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ComparatorUtil;
+import com.sampullara.cli.Argument;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.cli.common.arguments.Argument;
-import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments;
-import org.jetbrains.kotlin.cli.common.arguments.ParseCommandLineArgumentsKt;
-import org.jetbrains.kotlin.utils.StringsKt;
+import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 public class ArgumentUtils {
     private ArgumentUtils() {}
 
     @NotNull
-    public static List<String> convertArgumentsToStringList(@NotNull CommonToolArguments arguments)
+    public static List<String> convertArgumentsToStringList(@NotNull CommonCompilerArguments arguments)
             throws InstantiationException, IllegalAccessException {
-        List<String> result = new ArrayList<>();
+        List<String> result = new ArrayList<String>();
         convertArgumentsToStringList(arguments, arguments.getClass().newInstance(), arguments.getClass(), result);
         result.addAll(arguments.freeArgs);
         return result;
     }
 
     private static void convertArgumentsToStringList(
-            @NotNull CommonToolArguments arguments,
-            @NotNull CommonToolArguments defaultArguments,
+            @NotNull CommonCompilerArguments arguments,
+            @NotNull CommonCompilerArguments defaultArguments,
             @NotNull Class<?> clazz,
             @NotNull List<String> result
     ) throws IllegalAccessException, InstantiationException {
@@ -61,26 +60,27 @@ public class ArgumentUtils {
                 continue;
             }
 
-            if (value == null || Objects.equals(value, defaultValue)) continue;
+            if (ComparatorUtil.equalsNullable(value, defaultValue)) continue;
+
+            String name = getAlias(argument);
+            if (name == null) {
+                name = getName(argument, field);
+            }
 
             Class<?> fieldType = field.getType();
 
             if (fieldType.isArray()) {
                 Object[] values = (Object[]) value;
                 if (values.length == 0) continue;
-                value = StringsKt.join(Arrays.asList(values), ",");
+                //noinspection unchecked
+                value = StringUtil.join(values, Function.TO_STRING, argument.delimiter());
             }
 
-            result.add(argument.value());
+            result.add(argument.prefix() + name);
 
             if (fieldType == boolean.class || fieldType == Boolean.class) continue;
 
-            if (ParseCommandLineArgumentsKt.isAdvanced(argument)) {
-                result.set(result.size() - 1, argument.value() + "=" + value.toString());
-            }
-            else {
-                result.add(value.toString());
-            }
+            result.add(value.toString());
         }
 
         Class<?> superClazz = clazz.getSuperclass();
@@ -88,4 +88,14 @@ public class ArgumentUtils {
             convertArgumentsToStringList(arguments, defaultArguments, superClazz, result);
         }
     }
+
+    private static String getAlias(Argument argument) {
+        String alias = argument.alias();
+        return alias.isEmpty() ? null : alias;
+    }
+
+    private static String getName(Argument argument, Field field) {
+        String name = argument.value();
+        return name.isEmpty() ? field.getName() : name;
+    }
 }

build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt

@@ -21,11 +21,10 @@ import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion
 import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
 import java.io.File
-import java.io.IOException
 
 private val NORMAL_VERSION = 8
 private val EXPERIMENTAL_VERSION = 4
-private val DATA_CONTAINER_VERSION = 2
+private val DATA_CONTAINER_VERSION = 1
 
 private val NORMAL_VERSION_FILE_NAME = "format-version.txt"
 private val EXPERIMENTAL_VERSION_FILE_NAME = "experimental-format-version.txt"
@@ -41,16 +40,8 @@ class CacheVersion(
 ) {
     private val isEnabled by lazy(isEnabled)
 
-    private val actualVersion: Int?
-        get() = try {
-            versionFile.readText().toInt()
-        }
-        catch (e: NumberFormatException) {
-            null
-        }
-        catch (e: IOException) {
-            null
-        }
+    private val actualVersion: Int
+        get() = versionFile.readText().toInt()
 
     private val expectedVersion: Int
         get() {

build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt

@@ -19,15 +19,15 @@ package org.jetbrains.kotlin.incremental
 import org.jetbrains.kotlin.cli.common.ExitCode
 import java.io.File
 
-interface ICReporter {
-    fun report(message: ()->String)
+abstract class ICReporter {
+    abstract fun report(message: ()->String)
 
     // used in Gradle plugin
     @Suppress("unused")
-    fun reportCompileIteration(sourceFiles: Collection<File>, exitCode: ExitCode) {}
+    open fun reportCompileIteration(sourceFiles: Iterable<File>, exitCode: ExitCode) {}
 
-    fun pathsAsString(files: Iterable<File>): String =
-            files.joinToString { it.canonicalPath }
+    open fun pathsAsString(files: Iterable<File>): String =
+            files.map { it.canonicalPath }.joinToString()
 
     fun pathsAsString(vararg files: File): String =
             pathsAsString(files.toList())

build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt

@@ -43,6 +43,7 @@ import org.jetbrains.kotlin.serialization.deserialization.TypeTable
 import org.jetbrains.kotlin.serialization.deserialization.supertypes
 import org.jetbrains.kotlin.serialization.jvm.BitEncoding
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
+import org.jetbrains.kotlin.utils.singletonOrEmptyList
 import org.jetbrains.org.objectweb.asm.*
 import java.io.File
 import java.security.MessageDigest
@@ -271,7 +272,7 @@ open class IncrementalCacheImpl<Target>(
                                     ProtoBuf.Class::getPropertyList
                             ) + classData.classProto.enumEntryList.map { classData.nameResolver.getString(it.name) }
 
-                    val companionObjectChanged = createChangeInfo(classFqName.parent(), listOfNotNull(classFqName.shortName().asString()))
+                    val companionObjectChanged = createChangeInfo(classFqName.parent(), classFqName.shortName().asString().singletonOrEmptyList())
                     val companionObjectMembersChanged = createChangeInfo(classFqName, memberNames)
 
                     listOf(companionObjectMembersChanged, companionObjectChanged)
@@ -779,7 +780,7 @@ sealed class ChangeInfo(val fqName: FqName) {
     protected open fun toStringProperties(): String = "fqName = $fqName"
 
     override fun toString(): String {
-        return this::class.java.simpleName + "(${toStringProperties()})"
+        return this.javaClass.simpleName + "(${toStringProperties()})"
     }
 }
 

build-common/src/org/jetbrains/kotlin/incremental/LocalFileKotlinClass.kt

@@ -50,5 +50,5 @@ class LocalFileKotlinClass private constructor(
 
     override fun hashCode(): Int = file.hashCode()
     override fun equals(other: Any?): Boolean = other is LocalFileKotlinClass && file == other.file
-    override fun toString(): String = "${this::class.java}: $file"
+    override fun toString(): String = "$javaClass: $file"
 }

build-common/src/org/jetbrains/kotlin/incremental/LookupStorage.kt

@@ -197,7 +197,7 @@ open class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() {
 }
 
 class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker {
-    val lookups = MultiMap.createSet<LookupSymbol, String>()
+    val lookups = MultiMap<LookupSymbol, String>()
     val pathInterner = StringInterner()
     private val interner = StringInterner()
 

build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2017 JetBrains s.r.o.
+ * Copyright 2010-2016 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.
@@ -56,12 +56,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
             if (!checkStringEquals(old.getExtension(JvmProtoBuf.packageModuleName), new.getExtension(JvmProtoBuf.packageModuleName))) return false
         }
 
-        if (old.getExtensionCount(JvmProtoBuf.packageLocalVariable) != new.getExtensionCount(JvmProtoBuf.packageLocalVariable)) return false
-
-        for(i in 0..old.getExtensionCount(JvmProtoBuf.packageLocalVariable) - 1) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.packageLocalVariable, i), new.getExtension(JvmProtoBuf.packageLocalVariable, i))) return false
-        }
-
         return true
     }
     enum class ProtoBufPackageKind {
@@ -70,8 +64,7 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
         TYPE_ALIAS_LIST,
         TYPE_TABLE,
         SINCE_KOTLIN_INFO_TABLE,
-        PACKAGE_MODULE_NAME,
-        PACKAGE_LOCAL_VARIABLE_LIST
+        PACKAGE_MODULE_NAME
     }
 
     fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet<ProtoBufPackageKind> {
@@ -98,12 +91,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
             if (!checkStringEquals(old.getExtension(JvmProtoBuf.packageModuleName), new.getExtension(JvmProtoBuf.packageModuleName))) result.add(ProtoBufPackageKind.PACKAGE_MODULE_NAME)
         }
 
-        if (old.getExtensionCount(JvmProtoBuf.packageLocalVariable) != new.getExtensionCount(JvmProtoBuf.packageLocalVariable)) result.add(ProtoBufPackageKind.PACKAGE_LOCAL_VARIABLE_LIST)
-
-        for(i in 0..old.getExtensionCount(JvmProtoBuf.packageLocalVariable) - 1) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.packageLocalVariable, i), new.getExtension(JvmProtoBuf.packageLocalVariable, i))) result.add(ProtoBufPackageKind.PACKAGE_LOCAL_VARIABLE_LIST)
-        }
-
         return result
     }
 
@@ -138,8 +125,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
 
         if (!checkEqualsClassEnumEntry(old, new)) return false
 
-        if (!checkEqualsClassSealedSubclassFqName(old, new)) return false
-
         if (old.hasTypeTable() != new.hasTypeTable()) return false
         if (old.hasTypeTable()) {
             if (!checkEquals(old.typeTable, new.typeTable)) return false
@@ -160,12 +145,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
             if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) return false
         }
 
-        if (old.getExtensionCount(JvmProtoBuf.classLocalVariable) != new.getExtensionCount(JvmProtoBuf.classLocalVariable)) return false
-
-        for(i in 0..old.getExtensionCount(JvmProtoBuf.classLocalVariable) - 1) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.classLocalVariable, i), new.getExtension(JvmProtoBuf.classLocalVariable, i))) return false
-        }
-
         return true
     }
     enum class ProtoBufClassKind {
@@ -181,12 +160,10 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
         PROPERTY_LIST,
         TYPE_ALIAS_LIST,
         ENUM_ENTRY_LIST,
-        SEALED_SUBCLASS_FQ_NAME_LIST,
         TYPE_TABLE,
         SINCE_KOTLIN_INFO,
         SINCE_KOTLIN_INFO_TABLE,
-        CLASS_MODULE_NAME,
-        CLASS_LOCAL_VARIABLE_LIST
+        CLASS_MODULE_NAME
     }
 
     fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet<ProtoBufClassKind> {
@@ -222,8 +199,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
 
         if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST)
 
-        if (!checkEqualsClassSealedSubclassFqName(old, new)) result.add(ProtoBufClassKind.SEALED_SUBCLASS_FQ_NAME_LIST)
-
         if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufClassKind.TYPE_TABLE)
         if (old.hasTypeTable()) {
             if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufClassKind.TYPE_TABLE)
@@ -244,12 +219,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
             if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) result.add(ProtoBufClassKind.CLASS_MODULE_NAME)
         }
 
-        if (old.getExtensionCount(JvmProtoBuf.classLocalVariable) != new.getExtensionCount(JvmProtoBuf.classLocalVariable)) result.add(ProtoBufClassKind.CLASS_LOCAL_VARIABLE_LIST)
-
-        for(i in 0..old.getExtensionCount(JvmProtoBuf.classLocalVariable) - 1) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.classLocalVariable, i), new.getExtension(JvmProtoBuf.classLocalVariable, i))) result.add(ProtoBufClassKind.CLASS_LOCAL_VARIABLE_LIST)
-        }
-
         return result
     }
 
@@ -881,16 +850,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
         return true
     }
 
-    open fun checkEqualsClassSealedSubclassFqName(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
-        if (old.sealedSubclassFqNameCount != new.sealedSubclassFqNameCount) return false
-
-        for(i in 0..old.sealedSubclassFqNameCount - 1) {
-            if (!checkClassIdEquals(old.getSealedSubclassFqName(i), new.getSealedSubclassFqName(i))) return false
-        }
-
-        return true
-    }
-
     open fun checkEqualsFunctionTypeParameter(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean {
         if (old.typeParameterCount != new.typeParameterCount) return false
 
@@ -1079,10 +1038,6 @@ fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int)
         hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.packageModuleName))
     }
 
-    for(i in 0..getExtensionCount(JvmProtoBuf.packageLocalVariable) - 1) {
-        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.packageLocalVariable, i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
     return hashCode
 }
 
@@ -1135,10 +1090,6 @@ fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) ->
         hashCode = 31 * hashCode + getEnumEntry(i).hashCode(stringIndexes, fqNameIndexes)
     }
 
-    for(i in 0..sealedSubclassFqNameCount - 1) {
-        hashCode = 31 * hashCode + fqNameIndexes(getSealedSubclassFqName(i))
-    }
-
     if (hasTypeTable()) {
         hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes)
     }
@@ -1155,10 +1106,6 @@ fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) ->
         hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.classModuleName))
     }
 
-    for(i in 0..getExtensionCount(JvmProtoBuf.classLocalVariable) - 1) {
-        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classLocalVariable, i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
     return hashCode
 }
 

build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt

@@ -19,6 +19,7 @@
 
 package org.jetbrains.kotlin.incremental
 
+import com.intellij.ide.highlighter.JavaFileType
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.build.GeneratedFile
@@ -41,7 +42,9 @@ import java.util.*
 
 
 fun Iterable<File>.javaSourceRoots(roots: Iterable<File>): Iterable<File> =
-        filter(File::isJavaFile).mapNotNull { findSrcDirRoot(it, roots) }
+        filter { it.isJavaFile() }
+                .map { findSrcDirRoot(it, roots) }
+                .filterNotNull()
 
 fun makeModuleFile(name: String, isTest: Boolean, outputDir: File, sourcesToCompile: Iterable<File>, javaSourceRoots: Iterable<File>, classpath: Iterable<File>, friendDirs: Iterable<File>): File {
     val builder = KotlinModuleXmlBuilder()
@@ -51,7 +54,6 @@ fun makeModuleFile(name: String, isTest: Boolean, outputDir: File, sourcesToComp
             sourcesToCompile,
             javaSourceRoots.map { JvmSourceRoot(it) },
             classpath,
-            null,
             "java-production",
             isTest,
             // this excludes the output directories from the class path, to be removed for true incremental compilation
@@ -143,7 +145,7 @@ fun LookupStorage.update(
         filesToCompile: Iterable<File>,
         removedFiles: Iterable<File>
 ) {
-    if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker::class.java}")
+    if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker.javaClass}")
 
     removeLookupsFrom(filesToCompile.asSequence() + removedFiles.asSequence())
 
@@ -164,13 +166,12 @@ fun<Target> OutputItemsCollectorImpl.generatedFiles(
     return outputs.map { outputItem ->
         val target =
                 outputItem.sourceFiles.firstOrNull()?.let { sourceToTarget[it] } ?:
-                targets.singleOrNull { getOutputDir(it)?.let { outputItem.outputFile.startsWith(it) } ?: false } ?:
+                targets.filter { getOutputDir(it)?.let { outputItem.outputFile.startsWith(it) } ?: false }.singleOrNull() ?:
                 representativeTarget
-
-        when (outputItem.outputFile.extension) {
-            "class" -> GeneratedJvmClass(target, outputItem.sourceFiles, outputItem.outputFile)
-            else -> GeneratedFile(target, outputItem.sourceFiles, outputItem.outputFile)
-        }
+        if (outputItem.outputFile.name.endsWith(".class"))
+            GeneratedJvmClass(target, outputItem.sourceFiles, outputItem.outputFile)
+        else
+            GeneratedFile(target, outputItem.sourceFiles, outputItem.outputFile)
     }
 }
 

build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt

@@ -186,8 +186,7 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot
         }
 
         for (kind in diff) {
-            @Suppress("UNUSED_VARIABLE") // To make this 'when' exhaustive
-            val unused: Any = when (kind!!) {
+            when (kind!!) {
                 ProtoBufClassKind.COMPANION_OBJECT_NAME -> {
                     if (oldProto.hasCompanionObjectName()) oldProto.companionObjectName.oldToNames()
                     if (newProto.hasCompanionObjectName()) newProto.companionObjectName.newToNames()
@@ -204,7 +203,10 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot
                 }
                 ProtoBufClassKind.CONSTRUCTOR_LIST -> {
                     val differentNonPrivateConstructors = calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getConstructorList)
-                    isClassAffected = isClassAffected || differentNonPrivateConstructors.isNotEmpty()
+
+                    if (differentNonPrivateConstructors.isNotEmpty()) {
+                        isClassAffected = true
+                    }
                 }
                 ProtoBufClassKind.FUNCTION_LIST ->
                     names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList))
@@ -215,9 +217,6 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot
                 ProtoBufClassKind.ENUM_ENTRY_LIST -> {
                     isClassAffected = true
                 }
-                ProtoBufClassKind.SEALED_SUBCLASS_FQ_NAME_LIST -> {
-                    // TODO
-                }
                 ProtoBufClassKind.TYPE_TABLE -> {
                     // TODO
                 }
@@ -236,9 +235,6 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot
                 ProtoBufClassKind.CLASS_MODULE_NAME -> {
                     // TODO
                 }
-                ProtoBufClassKind.CLASS_LOCAL_VARIABLE_LIST -> {
-                    // Not affected, local variables are not accessible outside of a file
-                }
             }
         }
 
@@ -268,8 +264,7 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa
         }
 
         for (kind in diff) {
-            @Suppress("UNUSED_VARIABLE") // To make this 'when' exhaustive
-            val unused: Any = when (kind!!) {
+            when (kind!!) {
                 ProtoBufPackageKind.FUNCTION_LIST ->
                     names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getFunctionList))
                 ProtoBufPackageKind.PROPERTY_LIST ->
@@ -277,13 +272,10 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa
                 ProtoBufPackageKind.TYPE_ALIAS_LIST ->
                     names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getTypeAliasList))
                 ProtoBufPackageKind.TYPE_TABLE,
-                ProtoBufPackageKind.SINCE_KOTLIN_INFO_TABLE,
                 ProtoBufPackageKind.PACKAGE_MODULE_NAME -> {
                     // TODO
                 }
-                ProtoBufPackageKind.PACKAGE_LOCAL_VARIABLE_LIST -> {
-                    // Not affected, local variables are not accessible outside of a file
-                }
+                else -> throw IllegalArgumentException("Unsupported kind: $kind")
             }
         }
 

build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMap.kt

@@ -46,7 +46,7 @@ abstract class BasicMap<K : Comparable<K>, V>(
     fun dump(): String {
         return with(StringBuilder()) {
             with(Printer(this)) {
-                println(this@BasicMap::class.java.simpleName)
+                println(this@BasicMap.javaClass.simpleName)
                 pushIndent()
 
                 for (key in storage.keys.sorted()) {

build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMapsOwner.kt

@@ -42,5 +42,5 @@ open class BasicMapsOwner {
         maps.forEach { it.flush(memoryCachesOnly) }
     }
 
-    @TestOnly fun dump(): String = maps.joinToString("\n\n") { it.dump() }
+    @TestOnly fun dump(): String = maps.map { it.dump() }.joinToString("\n\n")
 }

build-common/src/org/jetbrains/kotlin/incremental/storage/externalizers.kt

@@ -131,7 +131,7 @@ object ConstantsMapExternalizer : DataExternalizer<Map<String, Any>> {
                     output.writeByte(Kind.STRING.ordinal)
                     IOUtil.writeString(value, output)
                 }
-                else -> throw IllegalStateException("Unexpected constant class: ${value::class.java}")
+                else -> throw IllegalStateException("Unexpected constant class: ${value.javaClass}")
             }
         }
     }

build-common/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt

@@ -39,7 +39,6 @@ class KotlinModuleXmlBuilder {
             sourceFiles: Iterable<File>,
             javaSourceRoots: Iterable<JvmSourceRoot>,
             classpathRoots: Iterable<File>,
-            modularJdkRoot: File?,
             targetTypeId: String,
             isTests: Boolean,
             directoriesToFilterOut: Set<File>,
@@ -65,10 +64,6 @@ class KotlinModuleXmlBuilder {
         processJavaSourceRoots(javaSourceRoots)
         processClasspath(classpathRoots, directoriesToFilterOut)
 
-        if (modularJdkRoot != null) {
-            p.println("<", MODULAR_JDK_ROOT, " ", PATH, "=\"", getEscapedPath(modularJdkRoot), "\"/>")
-        }
-
         closeTag(p, MODULE)
         return this
     }

build-common/test/org/jetbrains/kotlin/build/JvmBuildMetaInfoTest.kt

@@ -1,75 +0,0 @@
-/*
- * Copyright 2010-2017 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.build
-
-import junit.framework.TestCase
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.junit.Assert.assertNotEquals
-import org.junit.Test
-
-class JvmBuildMetaInfoTest : TestCase() {
-    @Test
-    fun testSerialization() {
-        val args = K2JVMCompilerArguments()
-        val info = JvmBuildMetaInfo(args)
-        val actual = JvmBuildMetaInfo.serializeToString(info)
-        val expectedKeys = listOf(
-                "apiVersionString",
-                "bytecodeVersionMajor",
-                "bytecodeVersionMinor",
-                "bytecodeVersionPatch",
-                "compilerBuildVersion",
-                "coroutinesEnable",
-                "coroutinesError",
-                "coroutinesVersion",
-                "coroutinesWarn",
-                "isEAP",
-                "languageVersionString",
-                "metadataVersionMajor",
-                "metadataVersionMinor",
-                "metadataVersionPatch",
-                "multiplatformEnable",
-                "multiplatformVersion",
-                "ownVersion"
-        )
-        assertEquals(expectedKeys, actual.split("\r\n", "\n").map { line -> line.split("=").first() })
-    }
-
-    @Test
-    fun testSerializationDeserialization() {
-        val args = K2JVMCompilerArguments()
-        val info = JvmBuildMetaInfo(args)
-        val serialized = JvmBuildMetaInfo.serializeToString(info)
-        val deserialized = JvmBuildMetaInfo.deserializeFromString(serialized)
-        assertEquals(info, deserialized)
-    }
-
-    @Test
-    fun testEquals() {
-        val args1 = K2JVMCompilerArguments()
-        args1.coroutinesState = CommonCompilerArguments.ENABLE
-        val info1 = JvmBuildMetaInfo(args1)
-
-        val args2 = K2JVMCompilerArguments()
-        args2.coroutinesState = CommonCompilerArguments.WARN
-        val info2 = JvmBuildMetaInfo(args2)
-
-        assertNotEquals(info1, info2)
-        assertEquals(info1, info2.copy(coroutinesEnable = true, coroutinesWarn = false))
-    }
-}

build-common/test/org/jetbrains/kotlin/build/SerializationUtilsTest.kt

@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2017 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.build
-
-import junit.framework.TestCase
-import org.junit.Test
-
-class SerializationUtilsTest : TestCase() {
-    data class TestPropertyTypes(
-            val intNull: Int?,
-            val int: Int,
-            val stringNull: String?,
-            val string: String,
-            val boolNull: Boolean?,
-            val bool: Boolean
-    )
-
-    @Test
-    fun testPropertyTypes() {
-        val instance1 = TestPropertyTypes(null, 1, null, "abc", null, false)
-        val deserialized1 = deserializeFromPlainText<TestPropertyTypes>(serializeToPlainText(instance1))
-        assertEquals(instance1, deserialized1)
-
-        val instance2 = TestPropertyTypes(1, 2, "abc", "xyz", true, false)
-        val deserialized2 = deserializeFromPlainText<TestPropertyTypes>(serializeToPlainText(instance2))
-        assertEquals(instance2, deserialized2)
-    }
-
-    data class TestAddedField1(val x: Int)
-    data class TestAddedField2(val x: Int, val y: Int?)
-
-    @Test
-    fun testAddedField() {
-        val testAddedField1 = TestAddedField1(1)
-        val serialized = serializeToPlainText(testAddedField1)
-        val deserialized = deserializeFromPlainText<TestAddedField2>(serialized)
-
-        assertEquals(TestAddedField2(1, null), deserialized)
-    }
-}
-

build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt

@@ -144,7 +144,7 @@ private fun classFileToString(classFile: File): String {
 
             out.write("\n------ string table types proto -----\n${DebugJvmProtoBuf.StringTableTypes.parseDelimitedFrom(input)}")
 
-            if (!classHeader.metadataVersion.isCompatible()) {
+            if (!classHeader!!.metadataVersion.isCompatible()) {
                 error("Incompatible class ($classHeader): $classFile")
             }
 

build-common/test/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt

@@ -81,8 +81,8 @@ fun getModificationsToPerform(
 
         val rules = mapOf<String, (String, File) -> Modification>(
                 newSuffix to { path, file -> ModifyContent(path, file) },
-                touchSuffix to { path, _ -> TouchFile(path, touchPolicy) },
-                deleteSuffix to { path, _ -> DeleteFile(path) }
+                touchSuffix to { path, file -> TouchFile(path, touchPolicy) },
+                deleteSuffix to { path, file -> DeleteFile(path) }
         )
 
         val modifications = ArrayList<Modification>()
@@ -130,7 +130,7 @@ fun getModificationsToPerform(
 abstract class Modification(val path: String) {
     abstract fun perform(workDir: File, mapping: MutableMap<File, File>)
 
-    override fun toString(): String = "${this::class.java.simpleName} $path"
+    override fun toString(): String = "${javaClass.simpleName} $path"
 }
 
 class ModifyContent(path: String, val dataFile: File) : Modification(path) {

build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java

@@ -1314,8 +1314,7 @@ public final class DebugJvmPackageTable {
      * <code>repeated string class_name = 2;</code>
      *
      * <pre>
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below)
+     * Short names of files, without extension, present in this package
      * </pre>
      */
     org.jetbrains.kotlin.protobuf.ProtocolStringList
@@ -1324,8 +1323,7 @@ public final class DebugJvmPackageTable {
      * <code>repeated string class_name = 2;</code>
      *
      * <pre>
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below)
+     * Short names of files, without extension, present in this package
      * </pre>
      */
     int getClassNameCount();
@@ -1333,8 +1331,7 @@ public final class DebugJvmPackageTable {
      * <code>repeated string class_name = 2;</code>
      *
      * <pre>
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below)
+     * Short names of files, without extension, present in this package
      * </pre>
      */
     java.lang.String getClassName(int index);
@@ -1342,78 +1339,11 @@ public final class DebugJvmPackageTable {
      * <code>repeated string class_name = 2;</code>
      *
      * <pre>
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below)
+     * Short names of files, without extension, present in this package
      * </pre>
      */
     org.jetbrains.kotlin.protobuf.ByteString
         getClassNameBytes(int index);
-
-    /**
-     * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-     *
-     * <pre>
-     * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * </pre>
-     */
-    java.util.List<java.lang.Integer> getMultifileFacadeIdList();
-    /**
-     * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-     *
-     * <pre>
-     * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * </pre>
-     */
-    int getMultifileFacadeIdCount();
-    /**
-     * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-     *
-     * <pre>
-     * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * </pre>
-     */
-    int getMultifileFacadeId(int index);
-
-    /**
-     * <code>repeated string multifile_facade_name = 4;</code>
-     *
-     * <pre>
-     * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-     * </pre>
-     */
-    org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getMultifileFacadeNameList();
-    /**
-     * <code>repeated string multifile_facade_name = 4;</code>
-     *
-     * <pre>
-     * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-     * </pre>
-     */
-    int getMultifileFacadeNameCount();
-    /**
-     * <code>repeated string multifile_facade_name = 4;</code>
-     *
-     * <pre>
-     * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-     * </pre>
-     */
-    java.lang.String getMultifileFacadeName(int index);
-    /**
-     * <code>repeated string multifile_facade_name = 4;</code>
-     *
-     * <pre>
-     * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-     * </pre>
-     */
-    org.jetbrains.kotlin.protobuf.ByteString
-        getMultifileFacadeNameBytes(int index);
   }
   /**
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
@@ -1482,36 +1412,6 @@ public final class DebugJvmPackageTable {
               className_.add(bs);
               break;
             }
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                multifileFacadeId_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              multifileFacadeId_.add(input.readInt32());
-              break;
-            }
-            case 26: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) {
-                multifileFacadeId_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                multifileFacadeId_.add(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 34: {
-              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                multifileFacadeName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              multifileFacadeName_.add(bs);
-              break;
-            }
           }
         }
       } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
@@ -1523,12 +1423,6 @@ public final class DebugJvmPackageTable {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           className_ = className_.getUnmodifiableView();
         }
-        if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-          multifileFacadeId_ = java.util.Collections.unmodifiableList(multifileFacadeId_);
-        }
-        if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-          multifileFacadeName_ = multifileFacadeName_.getUnmodifiableView();
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -1609,8 +1503,7 @@ public final class DebugJvmPackageTable {
      * <code>repeated string class_name = 2;</code>
      *
      * <pre>
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below)
+     * Short names of files, without extension, present in this package
      * </pre>
      */
     public org.jetbrains.kotlin.protobuf.ProtocolStringList
@@ -1621,8 +1514,7 @@ public final class DebugJvmPackageTable {
      * <code>repeated string class_name = 2;</code>
      *
      * <pre>
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below)
+     * Short names of files, without extension, present in this package
      * </pre>
      */
     public int getClassNameCount() {
@@ -1632,8 +1524,7 @@ public final class DebugJvmPackageTable {
      * <code>repeated string class_name = 2;</code>
      *
      * <pre>
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below)
+     * Short names of files, without extension, present in this package
      * </pre>
      */
     public java.lang.String getClassName(int index) {
@@ -1643,8 +1534,7 @@ public final class DebugJvmPackageTable {
      * <code>repeated string class_name = 2;</code>
      *
      * <pre>
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below)
+     * Short names of files, without extension, present in this package
      * </pre>
      */
     public org.jetbrains.kotlin.protobuf.ByteString
@@ -1652,97 +1542,9 @@ public final class DebugJvmPackageTable {
       return className_.getByteString(index);
     }
 
-    public static final int MULTIFILE_FACADE_ID_FIELD_NUMBER = 3;
-    private java.util.List<java.lang.Integer> multifileFacadeId_;
-    /**
-     * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-     *
-     * <pre>
-     * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * </pre>
-     */
-    public java.util.List<java.lang.Integer>
-        getMultifileFacadeIdList() {
-      return multifileFacadeId_;
-    }
-    /**
-     * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-     *
-     * <pre>
-     * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * </pre>
-     */
-    public int getMultifileFacadeIdCount() {
-      return multifileFacadeId_.size();
-    }
-    /**
-     * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-     *
-     * <pre>
-     * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * </pre>
-     */
-    public int getMultifileFacadeId(int index) {
-      return multifileFacadeId_.get(index);
-    }
-    private int multifileFacadeIdMemoizedSerializedSize = -1;
-
-    public static final int MULTIFILE_FACADE_NAME_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.protobuf.LazyStringList multifileFacadeName_;
-    /**
-     * <code>repeated string multifile_facade_name = 4;</code>
-     *
-     * <pre>
-     * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-     * </pre>
-     */
-    public org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getMultifileFacadeNameList() {
-      return multifileFacadeName_;
-    }
-    /**
-     * <code>repeated string multifile_facade_name = 4;</code>
-     *
-     * <pre>
-     * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-     * </pre>
-     */
-    public int getMultifileFacadeNameCount() {
-      return multifileFacadeName_.size();
-    }
-    /**
-     * <code>repeated string multifile_facade_name = 4;</code>
-     *
-     * <pre>
-     * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-     * </pre>
-     */
-    public java.lang.String getMultifileFacadeName(int index) {
-      return multifileFacadeName_.get(index);
-    }
-    /**
-     * <code>repeated string multifile_facade_name = 4;</code>
-     *
-     * <pre>
-     * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-     * </pre>
-     */
-    public org.jetbrains.kotlin.protobuf.ByteString
-        getMultifileFacadeNameBytes(int index) {
-      return multifileFacadeName_.getByteString(index);
-    }
-
     private void initFields() {
       packageFqName_ = "";
       className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      multifileFacadeId_ = java.util.Collections.emptyList();
-      multifileFacadeName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -1767,16 +1569,6 @@ public final class DebugJvmPackageTable {
       for (int i = 0; i < className_.size(); i++) {
         output.writeBytes(2, className_.getByteString(i));
       }
-      if (getMultifileFacadeIdList().size() > 0) {
-        output.writeRawVarint32(26);
-        output.writeRawVarint32(multifileFacadeIdMemoizedSerializedSize);
-      }
-      for (int i = 0; i < multifileFacadeId_.size(); i++) {
-        output.writeInt32NoTag(multifileFacadeId_.get(i));
-      }
-      for (int i = 0; i < multifileFacadeName_.size(); i++) {
-        output.writeBytes(4, multifileFacadeName_.getByteString(i));
-      }
       getUnknownFields().writeTo(output);
     }
 
@@ -1799,29 +1591,6 @@ public final class DebugJvmPackageTable {
         size += dataSize;
         size += 1 * getClassNameList().size();
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < multifileFacadeId_.size(); i++) {
-          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-            .computeInt32SizeNoTag(multifileFacadeId_.get(i));
-        }
-        size += dataSize;
-        if (!getMultifileFacadeIdList().isEmpty()) {
-          size += 1;
-          size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        multifileFacadeIdMemoizedSerializedSize = dataSize;
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < multifileFacadeName_.size(); i++) {
-          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-            .computeBytesSizeNoTag(multifileFacadeName_.getByteString(i));
-        }
-        size += dataSize;
-        size += 1 * getMultifileFacadeNameList().size();
-      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -1943,10 +1712,6 @@ public final class DebugJvmPackageTable {
         bitField0_ = (bitField0_ & ~0x00000001);
         className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
-        multifileFacadeId_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        multifileFacadeName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -1984,16 +1749,6 @@ public final class DebugJvmPackageTable {
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.className_ = className_;
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          multifileFacadeId_ = java.util.Collections.unmodifiableList(multifileFacadeId_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.multifileFacadeId_ = multifileFacadeId_;
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          multifileFacadeName_ = multifileFacadeName_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.multifileFacadeName_ = multifileFacadeName_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -2025,26 +1780,6 @@ public final class DebugJvmPackageTable {
           }
           onChanged();
         }
-        if (!other.multifileFacadeId_.isEmpty()) {
-          if (multifileFacadeId_.isEmpty()) {
-            multifileFacadeId_ = other.multifileFacadeId_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureMultifileFacadeIdIsMutable();
-            multifileFacadeId_.addAll(other.multifileFacadeId_);
-          }
-          onChanged();
-        }
-        if (!other.multifileFacadeName_.isEmpty()) {
-          if (multifileFacadeName_.isEmpty()) {
-            multifileFacadeName_ = other.multifileFacadeName_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureMultifileFacadeNameIsMutable();
-            multifileFacadeName_.addAll(other.multifileFacadeName_);
-          }
-          onChanged();
-        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -2163,8 +1898,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public org.jetbrains.kotlin.protobuf.ProtocolStringList
@@ -2175,8 +1909,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public int getClassNameCount() {
@@ -2186,8 +1919,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public java.lang.String getClassName(int index) {
@@ -2197,8 +1929,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public org.jetbrains.kotlin.protobuf.ByteString
@@ -2209,8 +1940,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public Builder setClassName(
@@ -2227,8 +1957,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public Builder addClassName(
@@ -2245,8 +1974,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public Builder addAllClassName(
@@ -2261,8 +1989,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public Builder clearClassName() {
@@ -2275,8 +2002,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        *
        * <pre>
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below)
+       * Short names of files, without extension, present in this package
        * </pre>
        */
       public Builder addClassNameBytes(
@@ -2290,243 +2016,6 @@ public final class DebugJvmPackageTable {
         return this;
       }
 
-      private java.util.List<java.lang.Integer> multifileFacadeId_ = java.util.Collections.emptyList();
-      private void ensureMultifileFacadeIdIsMutable() {
-        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          multifileFacadeId_ = new java.util.ArrayList<java.lang.Integer>(multifileFacadeId_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-       *
-       * <pre>
-       * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * </pre>
-       */
-      public java.util.List<java.lang.Integer>
-          getMultifileFacadeIdList() {
-        return java.util.Collections.unmodifiableList(multifileFacadeId_);
-      }
-      /**
-       * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-       *
-       * <pre>
-       * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * </pre>
-       */
-      public int getMultifileFacadeIdCount() {
-        return multifileFacadeId_.size();
-      }
-      /**
-       * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-       *
-       * <pre>
-       * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * </pre>
-       */
-      public int getMultifileFacadeId(int index) {
-        return multifileFacadeId_.get(index);
-      }
-      /**
-       * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-       *
-       * <pre>
-       * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * </pre>
-       */
-      public Builder setMultifileFacadeId(
-          int index, int value) {
-        ensureMultifileFacadeIdIsMutable();
-        multifileFacadeId_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-       *
-       * <pre>
-       * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * </pre>
-       */
-      public Builder addMultifileFacadeId(int value) {
-        ensureMultifileFacadeIdIsMutable();
-        multifileFacadeId_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-       *
-       * <pre>
-       * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * </pre>
-       */
-      public Builder addAllMultifileFacadeId(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureMultifileFacadeIdIsMutable();
-        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-            values, multifileFacadeId_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 multifile_facade_id = 3 [packed = true];</code>
-       *
-       * <pre>
-       * For each class name listed above, index of the name of the corresponding multi-file facade class in multifile_facade_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * </pre>
-       */
-      public Builder clearMultifileFacadeId() {
-        multifileFacadeId_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-
-      private org.jetbrains.kotlin.protobuf.LazyStringList multifileFacadeName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      private void ensureMultifileFacadeNameIsMutable() {
-        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          multifileFacadeName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(multifileFacadeName_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public org.jetbrains.kotlin.protobuf.ProtocolStringList
-          getMultifileFacadeNameList() {
-        return multifileFacadeName_.getUnmodifiableView();
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public int getMultifileFacadeNameCount() {
-        return multifileFacadeName_.size();
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public java.lang.String getMultifileFacadeName(int index) {
-        return multifileFacadeName_.get(index);
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public org.jetbrains.kotlin.protobuf.ByteString
-          getMultifileFacadeNameBytes(int index) {
-        return multifileFacadeName_.getByteString(index);
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public Builder setMultifileFacadeName(
-          int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureMultifileFacadeNameIsMutable();
-        multifileFacadeName_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public Builder addMultifileFacadeName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureMultifileFacadeNameIsMutable();
-        multifileFacadeName_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public Builder addAllMultifileFacadeName(
-          java.lang.Iterable<java.lang.String> values) {
-        ensureMultifileFacadeNameIsMutable();
-        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-            values, multifileFacadeName_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public Builder clearMultifileFacadeName() {
-        multifileFacadeName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string multifile_facade_name = 4;</code>
-       *
-       * <pre>
-       * Short names of multi-file facades, used in multifile_facade_id to store the part -&gt; facade mapping.
-       * </pre>
-       */
-      public Builder addMultifileFacadeNameBytes(
-          org.jetbrains.kotlin.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureMultifileFacadeNameIsMutable();
-        multifileFacadeName_.add(value);
-        onChanged();
-        return this;
-      }
-
       // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
     }
 
@@ -2563,11 +2052,9 @@ public final class DebugJvmPackageTable {
       "\022K\n\rpackage_parts\030\001 \003(\01324.org.jetbrains." +
       "kotlin.serialization.jvm.PackageParts\022L\n" +
       "\016metadata_parts\030\002 \003(\01324.org.jetbrains.ko" +
-      "tlin.serialization.jvm.PackageParts\"{\n\014P" +
+      "tlin.serialization.jvm.PackageParts\";\n\014P" +
       "ackageParts\022\027\n\017package_fq_name\030\001 \002(\t\022\022\n\n" +
-      "class_name\030\002 \003(\t\022\037\n\023multifile_facade_id\030" +
-      "\003 \003(\005B\002\020\001\022\035\n\025multifile_facade_name\030\004 \003(\t",
-      "B\026B\024DebugJvmPackageTable"
+      "class_name\030\002 \003(\tB\026B\024DebugJvmPackageTable"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -2592,7 +2079,7 @@ public final class DebugJvmPackageTable {
     internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
-        new java.lang.String[] { "PackageFqName", "ClassName", "MultifileFacadeId", "MultifileFacadeName", });
+        new java.lang.String[] { "PackageFqName", "ClassName", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java

@@ -14,9 +14,7 @@ public final class DebugJvmProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.isRaw);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.typeParameterAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.classModuleName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.classLocalVariable);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.packageModuleName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.packageLocalVariable);
   }
   public interface StringTableTypesOrBuilder extends
       // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
@@ -4588,17 +4586,6 @@ public final class DebugJvmProtoBuf {
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
-  public static final int CLASS_LOCAL_VARIABLE_FIELD_NUMBER = 102;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
-      java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Property>> classLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance());
   public static final int PACKAGE_MODULE_NAME_FIELD_NUMBER = 101;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Package { ... }</code>
@@ -4610,17 +4597,6 @@ public final class DebugJvmProtoBuf {
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
-  public static final int PACKAGE_LOCAL_VARIABLE_FIELD_NUMBER = 102;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Package { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Package,
-      java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Property>> packageLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance());
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
   private static
@@ -4702,15 +4678,9 @@ public final class DebugJvmProtoBuf {
       "g.jetbrains.kotlin.serialization.Annotat" +
       "ion:J\n\021class_module_name\022).org.jetbrains" +
       ".kotlin.serialization.Class\030e \001(\005B\004\230\265\030\001:" +
-      "u\n\024class_local_variable\022).org.jetbrains." +
-      "kotlin.serialization.Class\030f \003(\0132,.org.j" +
-      "etbrains.kotlin.serialization.Property:N",
-      "\n\023package_module_name\022+.org.jetbrains.ko" +
-      "tlin.serialization.Package\030e \001(\005B\004\230\265\030\001:y" +
-      "\n\026package_local_variable\022+.org.jetbrains" +
-      ".kotlin.serialization.Package\030f \003(\0132,.or" +
-      "g.jetbrains.kotlin.serialization.Propert" +
-      "yB\022B\020DebugJvmProtoBuf"
+      "N\n\023package_module_name\022+.org.jetbrains.k" +
+      "otlin.serialization.Package\030e \001(\005B\004\230\265\030\001B" +
+      "\022B\020DebugJvmProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -4763,9 +4733,7 @@ public final class DebugJvmProtoBuf {
     isRaw.internalInit(descriptor.getExtensions().get(4));
     typeParameterAnnotation.internalInit(descriptor.getExtensions().get(5));
     classModuleName.internalInit(descriptor.getExtensions().get(6));
-    classLocalVariable.internalInit(descriptor.getExtensions().get(7));
-    packageModuleName.internalInit(descriptor.getExtensions().get(8));
-    packageLocalVariable.internalInit(descriptor.getExtensions().get(9));
+    packageModuleName.internalInit(descriptor.getExtensions().get(7));
     org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
         org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);

compiler/android-tests/android-module/ant.properties

@@ -0,0 +1,18 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+tested.project.dir=tested-module

compiler/android-tests/android-module/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -64,27 +64,10 @@ android {
 
     dexOptions {
         dexInProcess false
-        javaMaxHeapSize "300m"
-        //default is 4 and Total Memory = maxProcessCount * javaMaxHeapSize
-        maxProcessCount 1
-        additionalParameters "--debug"
+        javaMaxHeapSize "600m"
     }
 }
 
-task jarTestFolders() {
-    println "Jar folders..."
-    new File("${projectDir}/libs/").listFiles().each { File file ->
-        if (file.isDirectory()) {
-            println "Jar '${file.name}' folder..."
-            ant.jar(basedir: "libs/${file.name}/", destfile: "libs/" +  file.name  + ".jar")
-        }
-    }
-}
-
-tasks.withType(JavaCompile) {
-    compileTask -> compileTask.dependsOn jarTestFolders
-}
-
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     androidTestCompile 'junit:junit:4.12'

compiler/android-tests/android-module/build.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="testsForAndroid" default="help" basedir="">
+
+  <property file="local.properties"/>
+
+  <property file="ant.properties"/>
+
+  <loadproperties srcFile="project.properties"/>
+
+  <import file="custom_rules.xml" optional="true"/>
+
+  <import file="${sdk.dir}/tools/ant/build.xml"/>
+
+  <target name="pack_libraries">
+    <jar basedir="libs/codegen-test-output" destfile="libs/test.jar"/>
+    <delete dir="libs/codegen-test-output"/>
+  </target>
+
+</project>

compiler/android-tests/android-module/gradle.properties

@@ -1,2 +0,0 @@
-#don't try to download android specific tools within gradle: licence acceptance will be required
-android.builder.sdkDownload=false

compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java

@@ -20,6 +20,7 @@ import com.intellij.util.PlatformUtils;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.android.tests.ant.AntRunner;
 import org.jetbrains.kotlin.android.tests.download.SDKDownloader;
 import org.jetbrains.kotlin.android.tests.emulator.Emulator;
 import org.jetbrains.kotlin.android.tests.gradle.GradleRunner;
@@ -82,6 +83,8 @@ public class CodegenTestsOnAndroidRunner {
         downloader.unzipAll();
         PermissionManager.setPermissions(pathManager);
 
+        AntRunner antRunner = new AntRunner(pathManager);
+        antRunner.packLibraries();
         Emulator emulator = new Emulator(pathManager, Emulator.ARM);
         GradleRunner gradleRunner = new GradleRunner(pathManager);
         gradleRunner.clean();
@@ -148,7 +151,7 @@ public class CodegenTestsOnAndroidRunner {
 
         for (int i = 0; i < testCases.getLength(); i++) {
             Element item = (Element) testCases.item(i);
-            NodeList failure = item.getElementsByTagName("failure");
+            final NodeList failure = item.getElementsByTagName("failure");
             String name = item.getAttribute("name");
             String clazz = item.getAttribute("classname");
 

compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java

@@ -16,8 +16,6 @@
 
 package org.jetbrains.kotlin.android.tests;
 
-import org.jetbrains.kotlin.android.tests.download.SDKDownloader;
-
 import java.io.File;
 
 public class PathManager {
@@ -52,8 +50,8 @@ public class PathManager {
         return getAndroidSdkRoot() + "/build-tools";
     }
 
-    public String getOutputForCompiledFiles(int index) {
-        return tmpFolder + "/libs/libtest" + index;
+    public String getOutputForCompiledFiles() {
+        return tmpFolder + "/libs/codegen-test-output";
     }
 
     public String getLibsFolderInAndroidTestedModuleTmpFolder() {
@@ -77,13 +75,17 @@ public class PathManager {
     }
 
     public String getGradleBinFolder() {
-        return getDependenciesRoot() + "/gradle-" + SDKDownloader.GRADLE_VERSION + "/bin";
+        return getDependenciesRoot() + "/gradle-2.12/bin";
     }
 
     public String getRootForDownload() {
         return getDependenciesRoot() + "/download";
     }
 
+    public String getAntBinDirectory() {
+        return rootFolder + "/dependencies/ant-1.8/bin";
+    }
+
     public String getAndroidModuleRoot() {
         return rootFolder + "/compiler/android-tests/android-module";
     }

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

@@ -0,0 +1,105 @@
+/*
+ * 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.android.tests.ant;
+
+import com.intellij.execution.configurations.GeneralCommandLine;
+import com.intellij.openapi.util.SystemInfo;
+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.ExceptionUtilsKt;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AntRunner {
+    private final List<String> listOfAntCommands;
+
+    public AntRunner(PathManager pathManager) {
+        listOfAntCommands = new ArrayList<String>();
+        String antCmdName = SystemInfo.isWindows ? "ant.bat" : "ant";
+        listOfAntCommands.add(pathManager.getAntBinDirectory() + "/" + antCmdName);
+        listOfAntCommands.add("-Dsdk.dir=" + pathManager.getAndroidSdkRoot());
+        listOfAntCommands.add("-buildfile");
+        listOfAntCommands.add(pathManager.getTmpFolder() + "/build.xml");
+    }
+
+    /* Pack compiled sources on first step to one jar file */
+    public void packLibraries() {
+        System.out.println("Pack libraries...");
+        RunResult result = RunUtils.execute(generateCommandLine("pack_libraries"));
+        OutputUtils.checkResult(result);
+    }
+
+    /* Clean output directory */
+    public void cleanOutput() {
+        System.out.println("Clearing output directory...");
+        RunResult result = RunUtils.execute(generateCommandLine("clean"));
+        OutputUtils.checkResult(result);
+    }
+
+    public void compileSources() {
+        System.out.println("Compiling sources...");
+        RunResult result = RunUtils.execute(generateCommandLine("debug"));
+        OutputUtils.checkResult(result);
+    }
+
+    public void installApplicationOnEmulator() {
+        System.out.println("Installing apk...");
+        RunResult result = RunUtils.execute(generateCommandLine("installt"));
+        String resultOutput = result.getOutput();
+        if (!isInstallSuccessful(resultOutput)) {
+            installApplicationOnEmulator();
+            return;
+        }
+        else {
+            if (result.getStatus()) {
+                System.out.println(resultOutput);
+            }
+        }
+        OutputUtils.checkResult(result);
+    }
+
+    public String runTestsOnEmulator() {
+        System.out.println("Running tests...");
+        RunResult result = RunUtils.execute(generateCommandLine("test"));
+        String resultOutput = result.getOutput();
+        OutputUtils.checkResult(result);
+        return resultOutput;
+    }
+
+    private static boolean isInstallSuccessful(String output) {
+        if (output.contains("Is the system running?")) {
+            System.out.println("Device not ready. Waiting for 20 sec.");
+            try {
+                Thread.sleep(20000);
+            }
+            catch (InterruptedException e) {
+                throw ExceptionUtilsKt.rethrow(e);
+            }
+            return false;
+        }
+        return true;
+    }
+
+    private GeneralCommandLine generateCommandLine(String taskName) {
+        GeneralCommandLine commandLine = new GeneralCommandLine(listOfAntCommands);
+        commandLine.addParameter(taskName);
+        return commandLine;
+    }
+}

compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java

@@ -43,7 +43,6 @@ public class SDKDownloader {
     private static final String SDK_TOOLS = "25.1.1";
     public static final String BUILD_TOOLS = "23.0.3";
     private static final int ANDROID_VERSION = 19;
-    public static final String GRADLE_VERSION = "2.14.1";
 
 
     public SDKDownloader(PathManager pathManager) {
@@ -54,7 +53,7 @@ public class SDKDownloader {
         platformToolsZipPath = pathManager.getRootForDownload() + "/platform-tools.zip";
         skdToolsZipPath = pathManager.getRootForDownload() + "/tools.zip";
         buildToolsZipPath = pathManager.getRootForDownload() + "/build-tools.zip";
-        gradleZipPath = pathManager.getRootForDownload() + "/gradle" + GRADLE_VERSION + ".zip";
+        gradleZipPath = pathManager.getRootForDownload() + "/gradle.zip";
     }
 
     public void downloadPlatform() {
@@ -79,7 +78,7 @@ public class SDKDownloader {
     }
 
     public void downloadGradle() {
-        download("https://services.gradle.org/distributions/gradle-" + GRADLE_VERSION + "-bin.zip", gradleZipPath);
+        download("https://services.gradle.org/distributions/gradle-2.12-bin.zip", gradleZipPath);
     }
 
     private static String getDownloadUrl(String prefix) {
@@ -195,18 +194,21 @@ public class SDKDownloader {
         }
         try {
             byte[] buf = new byte[1024];
-            ZipEntry zipEntry = null;
-            try (ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(pathToFile))) {
-                zipEntry = zipInputStream.getNextEntry();
-                while (zipEntry != null) {
-                    String entryName = zipEntry.getName();
+            ZipInputStream zipinputstream;
+            ZipEntry zipentry;
+            zipinputstream = new ZipInputStream(new FileInputStream(pathToFile));
+
+            zipentry = zipinputstream.getNextEntry();
+            try {
+                while (zipentry != null) {
+                    String entryName = zipentry.getName();
                     int n;
                     File outputFile = new File(outputFolder + "/" + entryName);
 
-                    if (zipEntry.isDirectory()) {
+                    if (zipentry.isDirectory()) {
                         outputFile.mkdirs();
-                        zipInputStream.closeEntry();
-                        zipEntry = zipInputStream.getNextEntry();
+                        zipinputstream.closeEntry();
+                        zipentry = zipinputstream.getNextEntry();
                         continue;
                     }
                     else {
@@ -217,19 +219,23 @@ public class SDKDownloader {
                         outputFile.createNewFile();
                     }
 
-                    try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile)) {
-                        while ((n = zipInputStream.read(buf, 0, 1024)) > -1) {
-                            fileOutputStream.write(buf, 0, n);
+                    FileOutputStream fileoutputstream = new FileOutputStream(outputFile);
+                    try {
+                        while ((n = zipinputstream.read(buf, 0, 1024)) > -1) {
+                            fileoutputstream.write(buf, 0, n);
                         }
                     }
-                    zipInputStream.closeEntry();
-                    zipEntry = zipInputStream.getNextEntry();
+                    finally {
+                        fileoutputstream.close();
+                    }
+                    zipinputstream.closeEntry();
+                    zipentry = zipinputstream.getNextEntry();
                 }
+
+                zipinputstream.close();
             }
             catch (IOException e) {
-                if (zipEntry != null) {
-                    System.err.println("Entry name: " + zipEntry.getName());
-                }
+                System.err.println("Entry name: " + zipentry.getName());
                 e.printStackTrace();
             }
         }

compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java

@@ -30,7 +30,7 @@ public class GradleRunner {
     private final List<String> listOfCommands;
 
     public GradleRunner(PathManager pathManager) {
-        listOfCommands = new ArrayList<>();
+        listOfCommands = new ArrayList<String>();
         String cmdName = SystemInfo.isWindows ? "gradle.bat" : "gradle";
         listOfCommands.add(pathManager.getGradleBinFolder() + "/" + cmdName);
         listOfCommands.add("--build-file");
@@ -46,9 +46,7 @@ public class GradleRunner {
 
     public void build() {
         System.out.println("Building gradle project...");
-        GeneralCommandLine build = generateCommandLine("build");
-        build.addParameter("--stacktrace");
-        RunResult result = RunUtils.execute(build);
+        RunResult result = RunUtils.execute(generateCommandLine("build"));
         OutputUtils.checkResult(result);
     }
 

compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java

@@ -29,6 +29,7 @@ public class PermissionManager {
 
     public static void setPermissions(PathManager pathManager) {
         if (!SystemInfo.isWindows) {
+            RunUtils.execute(generateChmodCmd(pathManager.getAntBinDirectory() + "/ant"));
             setExecPermissionForSimpleNamedFiles(new File(pathManager.getToolsFolderInAndroidSdk()));
             setExecPermissionForSimpleNamedFiles(new File(pathManager.getToolsFolderInAndroidSdk() + "/bin64"));
             setExecPermissionForSimpleNamedFiles(new File(pathManager.getBuildToolsFolderInAndroidSdk() + "/" + SDKDownloader.BUILD_TOOLS));

compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunUtils.java

@@ -86,15 +86,22 @@ public class RunUtils {
         return run(settings);
     }
 
-    public static void executeOnSeparateThread(@NotNull RunSettings settings) {
+    public static void executeOnSeparateThread(@NotNull final RunSettings settings) {
         assert !settings.waitForEnd : "Use execute() instead";
-        new Thread(() -> run(settings)).start();
+        Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                RunUtils.run(settings);
+            }
+        });
+
+        t.start();
     }
 
-    private static RunResult run(RunSettings settings) {
+    private static RunResult run(final RunSettings settings) {
         System.out.println("RUN COMMAND: " + settings);
-        StringBuilder stdOut = new StringBuilder();
-        StringBuilder stdErr = new StringBuilder();
+        final StringBuilder stdOut = new StringBuilder();
+        final StringBuilder stdErr = new StringBuilder();
 
         OSProcessHandler handler;
         try {
@@ -104,7 +111,10 @@ public class RunUtils {
             }
             close(handler.getProcessInput());
         }
-        catch (ExecutionException | IOException e) {
+        catch (ExecutionException e) {
+            return new RunResult(false, getStackTrace(e));
+        }
+        catch (IOException e) {
             return new RunResult(false, getStackTrace(e));
         }
 

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

@@ -29,8 +29,8 @@ public class AndroidJpsBuildTestCase extends BaseKotlinJpsBuildTestCase {
 
     public void doTest() {
         initProject();
-        rebuildAllModules();
-        buildAllModules().assertSuccessful();
+        rebuildAll();
+        makeAll().assertSuccessful();
     }
 
     @Override

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

@@ -64,8 +64,11 @@ public class AndroidRunner extends TestSuite {
     private static void writeAndroidSkdToLocalProperties() throws IOException {
         System.out.println("Writing android sdk to local.properties: " + pathManager.getAndroidSdkRoot());
         File file = new File(pathManager.getTmpFolder() + "/local.properties");
-        try (FileWriter fw = new FileWriter(file)) {
+        FileWriter fw = new FileWriter(file);
+        try {
             fw.write("sdk.dir=" + pathManager.getAndroidSdkRoot());
+        } finally {
+            fw.close();
         }
     }
 }

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

@@ -32,8 +32,8 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.config.JVMConfigurationKeys;
 import org.jetbrains.kotlin.idea.KotlinFileType;
+import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.name.NameUtils;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.test.*;
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase;
@@ -55,7 +55,6 @@ public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
     private static final String generatorName = "CodegenTestsOnAndroidGenerator";
 
     private static int MODULE_INDEX = 1;
-    private int WRITED_FILES_COUNT = 0;
 
     private final List<String> generatedTestNames = Lists.newArrayList();
 
@@ -143,7 +142,7 @@ public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
         private final boolean isFullJdkAndRuntime;
         private final boolean inheritMultifileParts;
 
-        public List<KtFile> files = new ArrayList<>();
+        public List<KtFile> files = new ArrayList<KtFile>();
         private KotlinCoreEnvironment environment;
 
         private FilesWriter(boolean isFullJdkAndRuntime, boolean inheritMultifileParts) {
@@ -176,7 +175,7 @@ public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
 
         public void writeFilesOnDisk() {
             writeFiles(files);
-            files = new ArrayList<>();
+            files = new ArrayList<KtFile>();
             environment = createEnvironment(isFullJdkAndRuntime);
         }
 
@@ -192,15 +191,10 @@ public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
         private void writeFiles(List<KtFile> filesToCompile) {
             if (filesToCompile.isEmpty()) return;
 
-            //1000 files per folder, each folder would be jared by build.gradle script
-            // We can't create one big jar with all test cause dex has problem with memory on teamcity
-            WRITED_FILES_COUNT += filesToCompile.size();
-            File outputDir = new File(pathManager.getOutputForCompiledFiles(WRITED_FILES_COUNT / 1000));
-
             System.out.println("Generating " + filesToCompile.size() + " files" +
                                (inheritMultifileParts
                                 ? " (JVM.INHERIT_MULTIFILE_PARTS)"
-                                : isFullJdkAndRuntime ? " (full jdk and runtime)" : "") + " into " + outputDir.getName() + "...");
+                                : isFullJdkAndRuntime ? " (full jdk and runtime)" : "") + "...");
             OutputFileCollection outputFiles;
             try {
                 outputFiles = GenerationUtils.compileFiles(filesToCompile, environment).getFactory();
@@ -209,6 +203,7 @@ public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
                 throw new RuntimeException(e);
             }
 
+            File outputDir = new File(pathManager.getOutputForCompiledFiles());
             if (!outputDir.exists()) {
                 outputDir.mkdirs();
             }
@@ -249,11 +244,6 @@ public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
                     continue;
                 }
 
-                //TODO: support LANGUAGE_VERSION
-                if (InTextDirectivesUtils.isDirectiveDefined(fullFileText, "LANGUAGE_VERSION:")) {
-                    continue;
-                }
-
                 //TODO: support multifile facades
                 //TODO: support multifile facades hierarchies
                 if (hasBoxMethod(fullFileText)) {
@@ -289,7 +279,7 @@ public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
     }
 
     private String generateTestName(String fileName) {
-        String result = NameUtils.sanitizeAsJavaIdentifier(FileUtil.getNameWithoutExtension(StringUtil.capitalize(fileName)));
+        String result = JvmAbi.sanitizeAsJavaIdentifier(FileUtil.getNameWithoutExtension(StringUtil.capitalize(fileName)));
 
         int i = 0;
         while (generatedTestNames.contains(result)) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2017 JetBrains s.r.o.
+ * 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.
@@ -47,7 +47,6 @@ public class SpecialFiles {
         excludedFiles.add("arrayOfKClasses.kt");
         excludedFiles.add("enumKClassAnnotation.kt");
         excludedFiles.add("primitivesAndArrays.kt");
-        excludedFiles.add("getDelegateWithoutReflection.kt");
 
         // Reflection is used to check full class name
         excludedFiles.add("native");
@@ -97,14 +96,6 @@ public class SpecialFiles {
         excludedFiles.add("kt11121.kt");
         excludedFiles.add("kt5112.kt");
 
-        // Different format of inner signature on Android and JVM
-        excludedFiles.add("signatureOfDeepGenericInner.kt");
-        excludedFiles.add("signatureOfDeepInner.kt");
-        excludedFiles.add("signatureOfDeepInnerLastGeneric.kt");
-        excludedFiles.add("signatureOfGenericInnerGenericOuter.kt");
-        excludedFiles.add("signatureOfGenericInnerSimpleOuter.kt");
-        excludedFiles.add("signatureOfSimpleInnerSimpleOuter.kt");
-
         // Some classes are not visible on android
         excludedFiles.add("classpath.kt");
 

compiler/backend-common/backend-common.iml

@@ -7,6 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="util" />
   </component>

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

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.backend.common
 
-import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.backend.common.bridges.findInterfaceImplementation
 import org.jetbrains.kotlin.descriptors.*
@@ -25,11 +24,51 @@ 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.bindingContextUtil.isUsedAsExpression
+import org.jetbrains.kotlin.resolve.MemberComparator
+import org.jetbrains.kotlin.resolve.OverridingUtil
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.isDynamic
+import org.jetbrains.kotlin.utils.keysToMapExceptNulls
 
 object CodegenUtil {
+    // class Foo : Bar by baz
+    //   descriptor = Foo
+    //   toInterface = Bar
+    //   delegateExpressionType = typeof(baz)
+    // return Map<member of Foo, corresponding member of typeOf(baz)>
+    @JvmStatic
+    fun getDelegates(
+            descriptor: ClassDescriptor,
+            toInterface: ClassDescriptor,
+            delegateExpressionType: KotlinType? = null
+    ): Map<CallableMemberDescriptor, CallableDescriptor> {
+        if (delegateExpressionType?.isDynamic() ?: false) return emptyMap()
+
+        return descriptor.defaultType.memberScope.getContributedDescriptors().asSequence()
+                .filterIsInstance<CallableMemberDescriptor>()
+                .filter { it.kind == CallableMemberDescriptor.Kind.DELEGATION }
+                .asIterable()
+                .sortedWith(MemberComparator.INSTANCE)
+                .keysToMapExceptNulls { delegatingMember ->
+                    val actualDelegates = DescriptorUtils.getAllOverriddenDescriptors(delegatingMember)
+                            .filter { it.containingDeclaration == toInterface }
+                            .map { overriddenDescriptor ->
+                                val scope = (delegateExpressionType ?: toInterface.defaultType).memberScope
+                                val name = overriddenDescriptor.name
+
+                                // this is the actual member of delegateExpressionType that we are delegating to
+                                (scope.getContributedFunctions(name, NoLookupLocation.FROM_BACKEND) +
+                                 scope.getContributedVariables(name, NoLookupLocation.FROM_BACKEND))
+                                        .firstOrNull { it == overriddenDescriptor || OverridingUtil.overrides(it, overriddenDescriptor) }
+                             }
+
+                    assert(actualDelegates.size <= 1) { "Many delegates found for $delegatingMember: $actualDelegates" }
+
+                    actualDelegates.firstOrNull()
+                }
+    }
+
     @JvmStatic
     fun getDelegatePropertyIfAny(
             expression: KtExpression, classDescriptor: ClassDescriptor, bindingContext: BindingContext
@@ -91,7 +130,7 @@ object CodegenUtil {
         else if (traitMember is PropertyDescriptor) {
             for (traitAccessor in traitMember.accessors) {
                 for (inheritedAccessor in (copy as PropertyDescriptor).accessors) {
-                    if (inheritedAccessor::class.java == traitAccessor::class.java) { // same accessor kind
+                    if (inheritedAccessor.javaClass == traitAccessor.javaClass) { // same accessor kind
                         result.put(traitAccessor, inheritedAccessor)
                     }
                 }
@@ -101,11 +140,12 @@ object CodegenUtil {
     }
 
     @JvmStatic
-    fun getSuperClassBySuperTypeListEntry(specifier: KtSuperTypeListEntry, bindingContext: BindingContext): ClassDescriptor? {
+    fun getSuperClassBySuperTypeListEntry(specifier: KtSuperTypeListEntry, bindingContext: BindingContext): ClassDescriptor {
         val superType = bindingContext.get(BindingContext.TYPE, specifier.typeReference!!)
                         ?: error("superType should not be null: ${specifier.text}")
 
         return superType.constructor.declarationDescriptor as? ClassDescriptor
+               ?: error("ClassDescriptor of superType should not be null: ${specifier.text}")
     }
 
     @JvmStatic
@@ -142,24 +182,4 @@ object CodegenUtil {
                         function.returnType != null &&
                         isReturnTypeOk(function.returnType!!)
                     }
-
-
-    @JvmStatic
-    fun BindingContext.isExhaustive(whenExpression: KtWhenExpression, isStatement: Boolean): Boolean {
-        val slice = if (isStatement && !whenExpression.isUsedAsExpression(this)) {
-            BindingContext.IMPLICIT_EXHAUSTIVE_WHEN
-        }
-        else {
-            BindingContext.EXHAUSTIVE_WHEN
-        }
-        return this[slice, whenExpression] == true
-    }
-
-    @JvmStatic
-    fun constructFakeFunctionCall(project: Project, referencedFunction: FunctionDescriptor): KtCallExpression {
-        val fakeFunctionCall = StringBuilder("callableReferenceFakeCall(")
-        fakeFunctionCall.append(referencedFunction.valueParameters.joinToString(", ") { "p${it.index}" })
-        fakeFunctionCall.append(")")
-        return KtPsiFactory(project, markGenerated = false).createExpression(fakeFunctionCall.toString()) as KtCallExpression
-    }
 }

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

@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.BindingContextUtils
  * 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.
  */
-abstract class DataClassMethodGenerator(protected val declaration: KtClassOrObject, private val bindingContext: BindingContext) {
+abstract class DataClassMethodGenerator(private val declaration: KtClassOrObject, private val bindingContext: BindingContext) {
     protected val classDescriptor: ClassDescriptor = BindingContextUtils.getNotNull(bindingContext, BindingContext.CLASS, declaration)
 
     fun generate() {
@@ -103,5 +103,5 @@ abstract class DataClassMethodGenerator(protected val declaration: KtClassOrObje
                 .map { bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, it)!! }
 
     private val primaryConstructorParameters: List<KtParameter>
-        get() = (declaration as? KtClass)?.primaryConstructorParameters.orEmpty()
+        get() = (declaration as? KtClass)?.getPrimaryConstructorParameters().orEmpty()
 }

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

@@ -19,26 +19,11 @@ package org.jetbrains.kotlin.backend.common
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.DescriptorEquivalenceForOverrides
-import org.jetbrains.kotlin.resolve.DescriptorUtils
-import org.jetbrains.kotlin.resolve.descriptorUtil.module
+import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
 
-val SUSPEND_COROUTINE_OR_RETURN_NAME = Name.identifier("suspendCoroutineOrReturn")
-val COROUTINE_SUSPENDED_NAME = Name.identifier("COROUTINE_SUSPENDED")
+val SUSPEND_WITH_CURRENT_CONTINUATION_NAME = Name.identifier("suspendWithCurrentContinuation")
 
-val COROUTINES_INTRINSICS_PACKAGE_FQ_NAME = DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME.child(Name.identifier("intrinsics"))
-
-fun FunctionDescriptor.isBuiltInSuspendCoroutineOrReturn(): Boolean {
-    if (name != SUSPEND_COROUTINE_OR_RETURN_NAME) return false
-
-    val originalDeclaration = getBuiltInSuspendCoroutineOrReturn() ?: return false
-
-    return DescriptorEquivalenceForOverrides.areEquivalent(
-            originalDeclaration, this
-    )
-}
-
-fun FunctionDescriptor.getBuiltInSuspendCoroutineOrReturn() =
-        module.getPackage(COROUTINES_INTRINSICS_PACKAGE_FQ_NAME).memberScope
-                .getContributedFunctions(SUSPEND_COROUTINE_OR_RETURN_NAME, NoLookupLocation.FROM_BACKEND)
+fun FunctionDescriptor.getBuiltInSuspendWithCurrentContinuation() =
+        builtIns.builtInsCoroutinePackageFragment.getMemberScope()
+                .getContributedFunctions(SUSPEND_WITH_CURRENT_CONTINUATION_NAME, NoLookupLocation.FROM_BACKEND)
                 .singleOrNull()

compiler/backend/backend.iml

@@ -9,8 +9,11 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="backend-common" exported="" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="backend.jvm" />
+    <orderEntry type="module" module-name="ir.tree" />
   </component>
 </module>