Introduce Type Parameter

#KT-13155 Fixed

.gitignore

@@ -13,3 +13,11 @@ workspace.xml
 *.versionsBackup
 /idea/testData/debugger/tinyApp/classes*
 /jps-plugin/testData/kannotator
+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-XX:MaxPermSize=100m" />
+      <antCommandLine value="-J-XX:MaxPermSize=100m -J-ea" />
       <maximumHeapSize value="1024" />
     </buildFile>
     <buildFile url="file://$PROJECT_DIR$/update_dependencies.xml" />
@@ -11,12 +11,12 @@
       <maximumHeapSize value="512" />
     </buildFile>
     <buildFile url="file://$PROJECT_DIR$/idea-runner/runner.xml" />
-    <buildFile url="file://$PROJECT_DIR$/replicate_versions.xml" />
     <buildFile url="file://$PROJECT_DIR$/libraries/build-docs.xml">
       <maximumHeapSize value="1024" />
       <properties>
         <property name="dokka.path" value="../../dokka" />
       </properties>
     </buildFile>
+    <buildFile url="file://$PROJECT_DIR$/TeamCityRelay.xml" />
   </component>
 </project>

.idea/artifacts/KotlinAndroidExtensions.xml

@@ -1,26 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="KotlinAndroidExtensions">
-    <output-path>$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions</output-path>
-    <properties id="ant-postprocessing">
-      <options enabled="true">
-        <file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
-        <target>copy-runtime-for-idea-plugin</target>
-      </options>
-    </properties>
-    <root id="root">
-      <element id="directory" name="lib">
-        <element id="archive" name="kotlin-android-extensions.jar">
-          <element id="module-output" name="android-idea-plugin" />
-        </element>
-        <element id="directory" name="jps">
-          <element id="archive" name="kotlin-android-extensions-jps.jar">
-            <element id="module-output" name="android-jps-plugin" />
-          </element>
-        </element>
-        <element id="archive" name="android-compiler-plugin.jar">
-          <element id="module-output" name="android-compiler-plugin" />
-        </element>
-      </element>
-    </root>
-  </artifact>
-</component>

.idea/artifacts/KotlinFormatter.xml

@@ -0,0 +1,9 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="KotlinFormatter">
+    <output-path>$PROJECT_DIR$/out/artifacts/internal</output-path>
+    <root id="archive" name="kotlin-formatter.jar">
+      <element id="module-output" name="formatter" />
+      <element id="dir-copy" path="$PROJECT_DIR$/idea/formatter" />
+    </root>
+  </artifact>
+</component>

.idea/artifacts/KotlinJpsPlugin.xml

@@ -11,7 +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.1.jar" path-in-jar="/" />
+      <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" />
@@ -19,10 +19,12 @@
       <element id="module-output" name="util" />
       <element id="module-output" name="util.runtime" />
       <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
-      <element id="module-output" name="kotlinr" />
-      <element id="module-output" name="rmi-interface" />
+      <element id="module-output" name="daemon-client" />
+      <element id="module-output" name="daemon-common" />
       <element id="module-output" name="deserialization" />
       <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/native-platform-uberjar.jar" path-in-jar="/" />
+      <element id="module-output" name="android-extensions-jps" />
+      <element id="module-output" name="build-common" />
     </root>
   </artifact>
 </component>

.idea/artifacts/KotlinPlugin.xml

@@ -37,21 +37,44 @@
           <element id="module-output" name="idea-analysis" />
           <element id="module-output" name="ide-common" />
           <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
-          <element id="module-output" name="kotlin-android-plugin" />
+          <element id="module-output" name="idea-android" />
+          <element id="module-output" name="idea-android-output-parser" />
           <element id="module-output" name="js.serializer" />
           <element id="module-output" name="serialization" />
           <element id="module-output" name="idea-completion" />
           <element id="module-output" name="idea-core" />
-          <element id="module-output" name="idea-js" />
           <element id="module-output" name="container" />
-          <element id="module-output" name="rmi-interface" />
+          <element id="module-output" name="daemon-common" />
           <element id="module-output" name="idea-repl" />
+          <element id="module-output" name="idea-live-templates" />
+          <element id="module-output" name="resolution" />
+          <element id="module-output" name="plugin-api" />
+          <element id="module-output" name="idea-ultimate" />
+          <element id="module-output" name="formatter" />
+          <element id="module-output" name="idea-maven" />
+          <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/protobuf-2.6.1.jar" path-in-jar="/" />
         </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="kotlin-android-extensions-plugin.jar">
+          <element id="module-output" name="android-extensions-idea" />
+        </element>
+        <element id="archive" name="kotlin-android-extensions-compiler-plugin.jar">
+          <element id="module-output" name="android-extensions-compiler" />
+        </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-android" />
+        </element>
       </element>
       <element id="directory" name="kotlinc">
         <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />

.idea/codeInsightSettings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaProjectCodeInsightSettings">
+    <excluded-names>
+      <name>kotlin.reflect.jvm.internal.impl</name>
+    </excluded-names>
+  </component>
+</project>

.idea/compiler.xml

@@ -23,8 +23,19 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
+    <bytecodeTargetLevel>
+      <module name="android-studio" target="1.8" />
+      <module name="bare-plugin" target="1.8" />
+      <module name="idea" target="1.8" />
+      <module name="idea-analysis" target="1.8" />
+      <module name="idea-completion" target="1.8" />
+      <module name="idea-core" target="1.8" />
+      <module name="idea-live-templates" target="1.8" />
+      <module name="idea-repl" target="1.8" />
+      <module name="idea-runner" target="1.8" />
+      <module name="idea-test-framework" target="1.8" />
+      <module name="j2k" target="1.8" />
+      <module name="kannotator-jps-plugin-test" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/dictionaries/Alexey_Sedunov.xml

@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="Alexey.Sedunov">
+    <words>
+      <w>inplace</w>
+      <w>renamer</w>
+    </words>
+  </dictionary>
+</component>

.idea/dictionaries/Nikolay_Krasko.xml

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

.idea/dictionaries/bashor.xml

@@ -2,8 +2,9 @@
   <dictionary name="bashor">
     <words>
       <w>ctor</w>
+      <w>interner</w>
       <w>lookups</w>
       <w>unescape</w>
     </words>
   </dictionary>
-</component>
+</component>

.idea/dictionaries/dzharkov.xml

@@ -0,0 +1,10 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="dzharkov">
+    <words>
+      <w>checkcast</w>
+      <w>coroutine</w>
+      <w>insn</w>
+      <w>liveness</w>
+    </words>
+  </dictionary>
+</component>

.idea/dictionaries/valentin.xml

@@ -17,6 +17,7 @@
       <w>renderers</w>
       <w>rparenth</w>
       <w>selectioner</w>
+      <w>summand</w>
       <w>unpluralize</w>
       <w>weighers</w>
     </words>

.idea/inspectionProfiles/idea_default.xml

@@ -273,6 +273,9 @@
     <inspection_tool class="ObsoleteCollection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreRequiredObsoleteCollectionTypes" value="false" />
     </inspection_tool>
+    <inspection_tool class="PackageDirectoryMismatch" enabled="true" level="WARNING" enabled_by_default="false">
+      <scope name="all except testData" level="WARNING" enabled="true" />
+    </inspection_tool>
     <inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PublicFieldAccessedInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PyCompatibilityInspection" enabled="true" level="ERROR" enabled_by_default="true">

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinCompilerSettings">
+    <option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
+  </component>
+</project>

.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/cli_parser.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="cli-parser">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar!/" />
+      <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.1-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/idea_full.xml

@@ -11,7 +11,6 @@
     <SOURCES>
       <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$/dependencies/cli-parser-1.1.1-sources.jar!/" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />

.idea/libraries/java_decompiler_plugin.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="java-decompiler-plugin">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/java-decompiler/lib/java-decompiler.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/jps.xml

@@ -8,8 +8,18 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/protobuf-java-2.5.0-sources.jar!/" />
       <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/kotlin_reflect.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="kotlin-reflect">
+    <CLASSES>
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/kotlin_runtime.xml

@@ -2,11 +2,12 @@
   <library name="kotlin-runtime">
     <CLASSES>
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/libraries/stdlib/src" />
+      <root url="file://$PROJECT_DIR$/core/builtins/native" />
+      <root url="file://$PROJECT_DIR$/core/builtins/src" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/kotlin_test.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="kotlin-test">
+    <CLASSES>
+      <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" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/protobuf_java.xml

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

.idea/misc.xml

@@ -49,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_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" 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

@@ -3,9 +3,10 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-compiler-plugin/android-compiler-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-compiler-plugin/android-compiler-plugin.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/lint/android-annotations/android-annotations.iml" filepath="$PROJECT_DIR$/plugins/lint/android-annotations/android-annotations.iml" />
+      <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$/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-collector/annotation-collector.iml" filepath="$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" group="plugins" />
@@ -13,19 +14,25 @@
       <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" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" group="ide/jps" />
+      <module fileurl="file://$PROJECT_DIR$/build-common/build-common.iml" filepath="$PROJECT_DIR$/build-common/build-common.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/builtins/builtins.iml" filepath="$PROJECT_DIR$/core/builtins/builtins.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/tests-java8/compiler-tests-java8.iml" filepath="$PROJECT_DIR$/compiler/tests-java8/compiler-tests-java8.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" filepath="$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/container/container.iml" filepath="$PROJECT_DIR$/compiler/container/container.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon.iml" group="compiler/daemon" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon-client/daemon-client.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon-client/daemon-client.iml" group="compiler/daemon" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon-common/daemon-common.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon-common/daemon-common.iml" group="compiler/daemon" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" filepath="$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/deserialization/deserialization.iml" filepath="$PROJECT_DIR$/core/deserialization/deserialization.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" />
+      <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$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
@@ -33,17 +40,20 @@
       <module fileurl="file://$PROJECT_DIR$/idea/ide-common/ide-common.iml" filepath="$PROJECT_DIR$/idea/ide-common/ide-common.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea.iml" filepath="$PROJECT_DIR$/idea/idea.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" filepath="$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-android/idea-android.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" filepath="$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-js/idea-js.iml" filepath="$PROJECT_DIR$/idea/idea-js/idea-js.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-live-templates/idea-live-templates.iml" filepath="$PROJECT_DIR$/idea/idea-live-templates/idea-live-templates.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-maven/idea-maven.iml" filepath="$PROJECT_DIR$/idea/idea-maven/idea-maven.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/java8-tests/java8-tests.iml" filepath="$PROJECT_DIR$/compiler/java8-tests/java8-tests.iml" group="compiler" />
       <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.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" />
@@ -52,16 +62,23 @@
       <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$/idea/kotlin-android-plugin/kotlin-android-plugin.iml" filepath="$PROJECT_DIR$/idea/kotlin-android-plugin/kotlin-android-plugin.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/rmi/kotlinr/kotlinr.iml" filepath="$PROJECT_DIR$/compiler/rmi/kotlinr/kotlinr.iml" group="rmi" />
       <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$/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" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
       <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/rmi/rmi-interface/rmi-interface.iml" filepath="$PROJECT_DIR$/compiler/rmi/rmi-interface/rmi-interface.iml" group="rmi" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/rmi/rmi-server/rmi-server.iml" filepath="$PROJECT_DIR$/compiler/rmi/rmi-server/rmi-server.iml" group="rmi" />
+      <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$/compiler/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/serialization/serialization.iml" group="compiler" />
+      <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$/plugins/lint/uast-android/uast-android.iml" filepath="$PROJECT_DIR$/plugins/lint/uast-android/uast-android.iml" group="plugins/lint" />
+      <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$/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_Compiler_Tests.xml

@@ -1,37 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All Compiler Tests" 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" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <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 -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
-    <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="moduleWithDependencies" />
-    </option>
-    <envs />
-    <patterns />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Profile " />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
+  <configuration default="false" name="All Compiler Tests" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
+    <toRun type="JUnit" name="Compiler Tests" />
+    <toRun type="JUnit" name="Java 8 Tests" />
+    <toRun type="JUnit" name="Js-backend tests" />
     <method />
   </configuration>
 </component>

.idea/runConfigurations/All_IDEA_Plugin_Tests.xml

@@ -8,12 +8,12 @@
     </extension>
     <module name="idea" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <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 -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
+    <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

@@ -8,12 +8,12 @@
     </extension>
     <module name="compiler-tests" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
     <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:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
+    <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

@@ -0,0 +1,39 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Non Compiler Tests" 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="non-compiler-tests" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="PACKAGE_NAME" value="" />
+    <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 -Xmx1300m -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="moduleWithDependencies" />
+    </option>
+    <envs>
+      <env name="NO_FS_ROOTS_ACCESS_CHECK" value="true" />
+    </envs>
+    <patterns />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="53032" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Profile " />
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method />
+  </configuration>
+</component>

.idea/runConfigurations/All_Tests.xml

@@ -1,39 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All Tests" 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="generators" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="" />
-    <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:MaxPermSize=400m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m" />
-    <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="moduleWithDependencies" />
-    </option>
-    <envs>
-      <env name="NO_FS_ROOTS_ACCESS_CHECK" value="true" />
-    </envs>
-    <patterns />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="53032" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Profile " />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
+  <configuration default="false" name="All Tests" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
+    <toRun type="CompoundRunConfigurationType" name="All Compiler Tests" />
+    <toRun type="JUnit" name="All Non Compiler Tests" />
     <method />
   </configuration>
 </component>

.idea/runConfigurations/All_in_jps_tests.xml

@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All in jps-tests" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <module name="jps-tests" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="PACKAGE_NAME" value="" />
+    <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=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" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="singleModule" />
+    </option>
+    <envs />
+    <patterns />
+    <RunnerSettings RunnerId="Profile ">
+      <option name="myExternalizedOptions" />
+    </RunnerSettings>
+    <method />
+  </configuration>
+</component>

.idea/runConfigurations/Android_Studio.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Android Studio" type="Application" factoryName="Application">
     <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="-Didea.paths.selector=AndroidStudioPreview -Didea.platform.prefix=AndroidStudio -Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin,$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions" />
+    <option name="VM_PARAMETERS" value="-Didea.paths.selector=AndroidStudioPreview -Didea.platform.prefix=AndroidStudio -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,$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android-studio/sdk/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -24,9 +24,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
     </method>
   </configuration>
 </component>

.idea/runConfigurations/Codegen_Tests_on_Android.xml

@@ -2,13 +2,13 @@
   <configuration default="false" name="Codegen Tests on Android" type="JUnit" factoryName="JUnit">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="android-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <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="" />
     <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx512m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx850m -XX:+UseCodeCacheFlushing  -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/Compiler_Tests.xml

@@ -0,0 +1,37 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Compiler Tests" 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" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <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 -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" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="moduleWithDependencies" />
+    </option>
+    <envs />
+    <patterns />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Profile " />
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method />
+  </configuration>
+</component>

.idea/runConfigurations/Eval4j_Tests.xml

@@ -3,12 +3,12 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="eval4j" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="org.jetbrains.eval4j.test" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
+    <option name="VM_PARAMETERS" value="-ea  -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/IDEA.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="IDEA" type="Application" factoryName="Application" singleton="true">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <option name="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" />
@@ -43,9 +43,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
       <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
     </method>
   </configuration>

.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <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" />
@@ -24,9 +24,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
       <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
     </method>
   </configuration>

.idea/runConfigurations/IDEA__win_.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA (win)" type="Application" factoryName="Application">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=${JAVA_HOME}\lib\tools.jar,../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="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.7" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="idea-runner" />
-    <envs />
-    <method>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinPlugin" />
-      </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
-    </method>
-  </configuration>
-</component>

.idea/runConfigurations/J2K_Tests.xml

@@ -8,21 +8,24 @@
     </extension>
     <module name="j2k" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <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 -Xmx350m -XX:MaxPermSize=320m" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx700m -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" />
+      <value defaultName="moduleWithDependencies" />
     </option>
     <envs />
-    <patterns />
+    <patterns>
+      <pattern testClass="org.jetbrains.kotlin.idea.conversion.copy.*" />
+      <pattern testClass="org.jetbrains.kotlin.j2k.*" />
+    </patterns>
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />
       <option name="TRANSPORT" value="0" />

.idea/runConfigurations/Java_8_Tests.xml

@@ -6,14 +6,14 @@
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
-    <module name="java8-tests" />
+    <module name="compiler-tests-java8" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
     <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=64m" />
+    <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/Js_backend_tests.xml

@@ -3,12 +3,12 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="js.tests" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.js.test" />
     <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:MaxPermSize=320m -XX:+UseCodeCacheFlushing" />
+    <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" />

.idea/runConfigurations/KAnnotator_Jps_Plugin_Test.xml

@@ -3,12 +3,12 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="kannotator-jps-plugin-test" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.jps.build.kannotator" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
+    <option name="VM_PARAMETERS" value="-ea -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/Smart_Completion_Tests.xml

@@ -8,12 +8,12 @@
     </extension>
     <module name="idea" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.completion.handlers" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="pattern" />
-    <option name="VM_PARAMETERS" value="-ea -Xmx512m -XX:MaxPermSize=320m" />
+    <option name="VM_PARAMETERS" value="-ea -Xmx850m -Djna.nosys=true" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />

.idea/runConfigurations/Update_Dist_Run.xml

@@ -2,11 +2,11 @@
   <configuration default="false" name="Update-Dist-Run" type="Application" factoryName="Application" singleton="true">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <option name="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" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="ENABLE_SWING_INSPECTOR" value="false" />
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
@@ -22,9 +22,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
       <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea_runner/runner.xml" target="force_enable_kotlin_plugin" />
     </method>
   </configuration>

.idea/scopes/IDE.xml

@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="IDE" pattern="file[idea]:*/||file[idea-analysis]:*/||file[ide-lazy-resolve]:*/" />
+  <scope name="IDE" pattern="file[idea]:src/*/||file[idea]:testData/*/||file[ide-common]:src/*/||file[idea-analysis]:src/*/||file[idea-android]:src/*/||file[idea-completion]:src/*/||file[idea-completion]:testData/*/||file[idea-core]:src/*/||file[idea-jps-common]:/*/||file[idea-live-templates]:/*/||file[idea-live-templates]:testData/*/||file[idea-repl]:/*/||src[idea-android-output-parser]:*..*" />
 </component>

ReadMe.md

@@ -1,3 +1,4 @@
+<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)
@@ -19,13 +20,26 @@ Welcome to [Kotlin](http://kotlinlang.org/)! Some handy links:
 
 ## Editing Kotlin
 
- * [Kotlin IntelliJ IDEA Plugin](http://hadihariri.com/2012/02/17/the-kotlin-journey-part-i-getting-things-set-up/)
+ * [Kotlin IntelliJ IDEA Plugin](https://kotlinlang.org/docs/tutorials/getting-started.html)
  * [Kotlin Eclipse Plugin](http://kotlinlang.org/docs/tutorials/getting-started-eclipse.html)
- * [Kotlin TextMate Bundle](https://github.com/k33g/kotlin-textmate-bundle#readme)
+ * [Kotlin TextMate Bundle](https://github.com/vkostyukov/kotlin-sublime-package)
+
+## Build environment requirements
+
+In order to build Kotlin distribution you need to have:
+
+- Apache Ant 1.8 and higher
+- JDK 1.6, 1.7 and 1.8
+- Setup environment variables as following:
+
+        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"
 
 ## Building
 
-To build this project, first time you try to build you need to run this (requires Apache **Ant 1.8** or higher and **JDK 1.6**):
+To build this project, first time you try to build you need to run this:
 
     ant -f update_dependencies.xml
 
@@ -45,7 +59,7 @@ which will build the binaries of the compiler and put them into the 'dist' direc
 
     mvn package
 
-from 'libraries' directory after building the compiler. Refer to `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
 
@@ -106,7 +120,7 @@ We love contributions! There's [lots to do on Kotlin](http://youtrack.jetbrains.
 about what you're interested in doing? Please join the #kontributors channel in [our Slack chat](http://kotlinslackin.herokuapp.com/)
 and let us know about your plans.
 
-If you want to find some issues to start off with, try [this query](https://youtrack.jetbrains.com/issues?q=tag%3A+%7BUp+For+Grabs%7D+%23Unresolved) which should find all issues that marked as "up-for-grabs".
+If you want to find some issues to start off with, try [this query](https://youtrack.jetbrains.com/issues/KT?q=tag:%20%7BUp%20For%20Grabs%7D%20%23Unresolved) which should find all Kotlin issues that marked as "up-for-grabs".
 
 Currently only committers can assign issues to themselves so just add a comment if you're starting work on it.
 
@@ -114,9 +128,9 @@ A nice gentle way to contribute would be to review the [standard library docs](h
 and find classes or functions which are not documented very well and submit a patch.
 
 In particular it'd be great if all functions included a nice example of how to use it such as for the
-<a href="http://kotlinlang.org/api/latest/jvm/stdlib/kotlin/hash-map-of.html">hashMapOf()</a> function.
-This is implemented using the <a href=https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/src/kotlin/collections/Maps.kt#L53">@sample</a>
-macro to include code from a test function. This serves as a double win; the API gets better documented with nice examples to help new users and the code gets more test coverage.
+[`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.
 

TeamCityBuild.xml

@@ -1,6 +1,5 @@
 <project name="Kotlin CI Steps" default="none">
     <import file="build.xml" optional="false"/>
-    <import file="replicate_versions.xml" optional="false"/>
 
     <property name="build.number" value="snapshot"/>
     <property name="jdk16.home" value="${java.home}"/>
@@ -13,17 +12,15 @@
     <property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/>
     <property name="plugin.xml.versioned" value="${plugin.xml}.versioned"/>
 
-    <property name="android-extensions.plugin.xml" value="plugins/android-idea-plugin/src/META-INF/plugin.xml"/>
-    <property name="android-extensions.plugin.xml.bk" value="${version_substitute_dir}/kotlin-android-extensions.plugin.xml.bk"/>
-    <property name="android-extensions.plugin.xml.versioned" value="${android-extensions.plugin.xml}.versioned"/>
-
     <property name="compiler.version.java" value="compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/KotlinVersion.java"/>
     <property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinVersion.java.bk"/>
     <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned"/>
 
     <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
     <property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip"/>
-    <property name="android-extensions.zip" value="${artifact.output.path}/kotlin-android-extensions-plugin-${build.number}.zip"/>
+
+    <property name="kotlin.bare.plugin.xml" value="jps-plugin/bare-plugin/src/META-INF/plugin.xml"/>
+    <property name="kotlin.bare.plugin.xml.bk" value="${version_substitute_dir}/kotlin.bare.plugin.xml.bk"/>
 
     <macrodef name="echoprop">
         <attribute name="prop"/>
@@ -87,25 +84,23 @@
                 target.file.versioned="${plugin.xml.versioned}"
                 test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
 
-        <substituteVersionInFile
-                target.file="${android-extensions.plugin.xml}"
-                target.file.bk="${android-extensions.plugin.xml.bk}"
-                target.file.versioned="${android-extensions.plugin.xml.versioned}"
-                test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
-
         <substituteVersionInFile
                 target.file="${compiler.version.java}"
                 target.file.bk="${compiler.version.java.bk}"
                 target.file.versioned="${compiler.version.java.versioned}"
                 test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
 
-        <replicateIdeaVersion target.file="${android-extensions.plugin.xml}"/>
-    </target>
+        <substituteVersionInFile
+                target.file="${kotlin.bare.plugin.xml}"
+                target.file.bk="${kotlin.bare.plugin.xml.bk}"
+                test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
+
+        </target>
 
     <target name="revertTemplateFiles">
         <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/>
-        <copy file="${android-extensions.plugin.xml.bk}" tofile="${android-extensions.plugin.xml}" overwrite="true"/>
         <copy file="${compiler.version.java.bk}" tofile="${compiler.version.java}" overwrite="true"/>
+        <copy file="${kotlin.bare.plugin.xml.bk}" tofile="${kotlin.bare.plugin.xml}" overwrite="true"/>
 
         <delete dir="${version_substitute_dir}" quiet="true"/>
     </target>
@@ -131,11 +126,6 @@
 
         <zipPlugin filename="${plugin.zip}" dir="Kotlin"/>
         <zipPlugin filename="${bare.plugin.zip}" dir="BareKotlin"/>
-
-        <zip destfile="${android-extensions.zip}">
-            <zipfileset prefix="KotlinAndroidExtensions" dir="${artifact.output.path}/KotlinAndroidExtensions"/>
-        </zip>
-        <delete dir="${artifact.output.path}/KotlinAndroidExtensions" quiet="true"/>
     </target>
 
     <macrodef name="print-statistic">
@@ -163,11 +153,11 @@
         <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/>
 
         <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-jslib.jar"/>
-        <print-file-size-statistic path="${output}" file-name="kotlin.js"/>
-        <print-file-size-statistic path="${output}" file-name="builtins.js"/>
-        <print-file-size-statistic path="${output}" file-name="builtins.meta.js"/>
-        <print-file-size-statistic path="${output}" file-name="stdlib.js"/>
-        <print-file-size-statistic path="${output}" file-name="stdlib.meta.js"/>
+        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin.js"/>
+        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="builtins.js"/>
+        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="builtins.meta.js"/>
+        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="stdlib.js"/>
+        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="stdlib.meta.js"/>
     </target>
 
     <target name="post_build" depends="zipArtifacts, revertTemplateFiles, printStatistics, remove_internal_artifacts, dont_remove_internal_artifacts"/>

TeamCityRelay.xml

@@ -0,0 +1,99 @@
+<project name="Change plugins version" default="change-version">
+    <property name="relay.origin.version" value="1.0.0-beta-2423"/>
+    <property name="relay.substitute.version" value="1.0.0-beta-2423-IJ-141-3"/>
+    <property name="relay.plugins.dir" value="artifacts"/>
+    <property name="relay.unpack.directory" value="relay-dir"/>
+
+    <macrodef name="substituteRegexpInFile">
+        <attribute name="src.file"/>
+        <attribute name="output.dir"/>
+        <attribute name="origin.version"/>
+        <attribute name="substituted.version"/>
+        <sequential>
+            <copy todir="@{output.dir}">
+                <fileset file="@{src.file}"/>
+                <filterchain>
+                    <replaceregex pattern="@{origin.version}" replace="@{substituted.version}" />
+                </filterchain>
+            </copy>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="substitudeVersionInPlugin">
+        <attribute name="plugin.path"/>
+        <attribute name="plugin.jar.name"/>
+        <attribute name="origin.version"/>
+        <attribute name="substituted.version"/>
+        <attribute name="plugin.subdir"/>
+
+        <attribute name="output-dir" default="@{substituted.version}"/>
+        <attribute name="output.plugin.file.name" default="@{plugin.jar.name}-@{substituted.version}.zip"/>
+
+        <attribute name="temp.origin.dir" default="${relay.unpack.directory}/@{plugin.jar.name}/plugin-origin"/>
+        <attribute name="temp.substitute.dir" default="${relay.unpack.directory}/@{plugin.jar.name}/substitute"/>
+
+        <sequential>
+            <delete dir="${relay.unpack.directory}/@{plugin.jar.name}"/>
+            <mkdir dir="${relay.unpack.directory}/@{plugin.jar.name}"/>
+
+            <unzip src="@{plugin.path}" dest="@{temp.origin.dir}">
+                <patternset>
+                    <include name="**/lib/@{plugin.jar.name}.jar" />
+                </patternset>
+                <flattenmapper/>
+            </unzip>
+
+            <unzip src="@{temp.origin.dir}/@{plugin.jar.name}.jar" dest="@{temp.origin.dir}">
+                <patternset>
+                    <include name="**/META-INF/plugin.xml" />
+                </patternset>
+                <flattenmapper/>
+            </unzip>
+
+            <substituteRegexpInFile
+                src.file="@{temp.origin.dir}/plugin.xml" output.dir="@{temp.substitute.dir}"
+                origin.version="@{origin.version}" substituted.version="@{substituted.version}"/>
+
+            <!-- Copy updated file back into jar -->
+            <copy file="@{temp.origin.dir}/@{plugin.jar.name}.jar" todir="@{temp.substitute.dir}"/>
+            <jar destfile="@{temp.substitute.dir}/@{plugin.jar.name}.jar" update="true">
+                <zipfileset file="@{temp.substitute.dir}/plugin.xml" prefix="META-INF"/>
+            </jar>
+
+            <!-- Pack updated plugin.jar back to zip file -->
+            <copy file="@{plugin.path}" tofile="@{substituted.version}/@{output.plugin.file.name}"/>
+            <zip destfile="@{substituted.version}/@{output.plugin.file.name}" update="true">
+                <zipfileset file="@{temp.substitute.dir}/@{plugin.jar.name}.jar" prefix="@{plugin.subdir}/lib"/>
+            </zip>
+        </sequential>
+    </macrodef>
+
+    <target name="change-version" description="Repack plugin with other version">
+        <delete dir="${relay.unpack.directory}"/>
+        <delete dir="${relay.substitute.version}"/>
+
+        <mkdir dir="${relay.unpack.directory}"/>
+        <mkdir dir="${relay.substitute.version}"/>
+
+        <substitudeVersionInPlugin
+            plugin.jar.name="kotlin-plugin"
+            plugin.path="${relay.plugins.dir}/kotlin-plugin-${relay.origin.version}.zip"
+            origin.version="${relay.origin.version}"
+            plugin.subdir="Kotlin"
+            substituted.version="${relay.substitute.version}"/>
+
+        <substitudeVersionInPlugin
+            plugin.jar.name="kotlin-bare-plugin"
+            plugin.path="${relay.plugins.dir}/kotlin-bare-plugin-${relay.origin.version}.zip"
+            origin.version="${relay.origin.version}"
+            plugin.subdir="BareKotlin"
+            substituted.version="${relay.substitute.version}"/>
+
+        <substitudeVersionInPlugin
+            plugin.jar.name="kotlin-android-extensions"
+            plugin.path="${relay.plugins.dir}/kotlin-android-extensions-plugin-${relay.origin.version}.zip"
+            origin.version="${relay.origin.version}"
+            plugin.subdir="KotlinAndroidExtensions"
+            substituted.version="${relay.substitute.version}"/>
+    </target>
+</project>

android-studio/android-studio.iml

@@ -3,10 +3,9 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="RUNTIME" name="android-studio" level="project" />
     <orderEntry type="module" module-name="idea" scope="PROVIDED" />
   </component>
-</module>
-
+</module>

ant/ant.iml

@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="ant" level="project" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="module" module-name="preloader" />
   </component>
 </module>

ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml

@@ -1,7 +0,0 @@
-<!-- NOTE: this Antlib is deprecated. Use org/jetbrains/kotlin/ant/antlib.xml instead -->
-<!-- TODO: delete this file -->
-<antlib>
-    <taskdef name="kotlinc" classname="org.jetbrains.kotlin.ant.Kotlin2JvmTask"/>
-    <taskdef name="kotlin2js" classname="org.jetbrains.kotlin.ant.Kotlin2JsTask"/>
-    <typedef name="withKotlin" classname="org.jetbrains.kotlin.ant.KotlinCompilerAdapter"/>
-</antlib>

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

@@ -19,22 +19,23 @@ package org.jetbrains.kotlin.ant
 import org.apache.tools.ant.types.Path
 import java.io.File
 
-public class Kotlin2JsTask : KotlinCompilerBaseTask() {
+class Kotlin2JsTask : KotlinCompilerBaseTask() {
     override val compilerFqName = "org.jetbrains.kotlin.cli.js.K2JSCompiler"
 
-    public var library: Path? = null
-    public var outputPrefix: File? = null
-    public var outputPostfix: File? = null
-    public var sourceMap: Boolean = false
-    public var metaInfo: Boolean = false
+    var library: Path? = null
+    var outputPrefix: File? = null
+    var outputPostfix: File? = null
+    var sourceMap: Boolean = false
+    var metaInfo: Boolean = false
+    var moduleKind: String = "plain"
 
     /**
      * {@link K2JsArgumentConstants.CALL} (default) if need generate a main function call (main function will be auto detected)
      * {@link K2JsArgumentConstants.NO_CALL} otherwise.
      */
-    public var main: String? = null
+    var main: String? = null
 
-    public fun createLibrary(): Path {
+    fun createLibrary(): Path {
         val libraryPath = library
         if (libraryPath == null) {
             val t = Path(getProject())
@@ -73,5 +74,7 @@ public class Kotlin2JsTask : KotlinCompilerBaseTask() {
         if (noStdlib) args.add("-no-stdlib")
         if (sourceMap) args.add("-source-map")
         if (metaInfo) args.add("-meta-info")
+
+        args += listOf("-module-kind", moduleKind)
     }
 }

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

@@ -20,15 +20,15 @@ import org.apache.tools.ant.types.Path
 import org.apache.tools.ant.types.Reference
 import java.io.File.pathSeparator
 
-public class Kotlin2JvmTask : KotlinCompilerBaseTask() {
+class Kotlin2JvmTask : KotlinCompilerBaseTask() {
     override val compilerFqName = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"
 
-    public var includeRuntime: Boolean = true
-    public var moduleName: String? = null
+    var includeRuntime: Boolean = true
+    var moduleName: String? = null
 
     private var compileClasspath: Path? = null
 
-    public fun setClasspath(classpath: Path) {
+    fun setClasspath(classpath: Path) {
         if (compileClasspath == null) {
             compileClasspath = classpath
         }
@@ -37,14 +37,14 @@ public class Kotlin2JvmTask : KotlinCompilerBaseTask() {
         }
     }
 
-    public fun setClasspathRef(ref: Reference) {
+    fun setClasspathRef(ref: Reference) {
         if (compileClasspath == null) {
             compileClasspath = Path(getProject())
         }
-        compileClasspath!!.createPath().setRefid(ref)
+        compileClasspath!!.createPath().refid = ref
     }
 
-    public fun addConfiguredClasspath(classpath: Path) {
+    fun addConfiguredClasspath(classpath: Path) {
         setClasspath(classpath)
     }
 

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

@@ -29,12 +29,12 @@ 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 = "/" + javaClass.getName().replace('.', '/') + ".class"
+        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.getJarFileURL().toURI())
+        val antTaskJarPath = File(jarConnection.jarFileURL.toURI())
 
-        antTaskJarPath.getParentFile()
+        antTaskJarPath.parentFile
     }
 
     val compilerJar: File by lazy {
@@ -47,7 +47,7 @@ object KotlinAntTaskUtil {
 
     private fun File.assertExists(): File {
         if (!this.exists()) {
-            throw IllegalStateException("${getName()} is not found in the directory of Kotlin Ant task")
+            throw IllegalStateException("${name} is not found in the directory of Kotlin Ant task")
         }
         return this
     }
@@ -68,5 +68,5 @@ object KotlinAntTaskUtil {
 
 }
 
-public val Task.defaultModuleName: String?
+val Task.defaultModuleName: String?
     get() = owningTarget?.name ?: project?.name

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

@@ -70,7 +70,7 @@ class KotlinCompilerAdapter : Javac13() {
         // Javac13#execute passes everything in compileList to javac, which doesn't recognize .kt files
         val compileListForJavac = filterOutKotlinSources(compileList)
 
-        val hasKotlinFilesInSources = compileListForJavac.size() < compileList.size()
+        val hasKotlinFilesInSources = compileListForJavac.size < compileList.size
 
         if (hasKotlinFilesInSources) {
             kotlinc.execute()

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

@@ -24,25 +24,25 @@ import org.apache.tools.ant.types.Reference
 import java.io.File
 import java.io.PrintStream
 
-public abstract class KotlinCompilerBaseTask : Task() {
+abstract class KotlinCompilerBaseTask : Task() {
     protected abstract val compilerFqName: String
 
-    public val args: MutableList<String> = arrayListOf()
+    val args: MutableList<String> = arrayListOf()
 
-    public var src: Path? = null
-    public var output: File? = null
-    public var nowarn: Boolean = false
-    public var verbose: Boolean = false
-    public var printVersion: Boolean = false
-    public var failOnError: Boolean = true
+    var src: Path? = null
+    var output: File? = null
+    var nowarn: Boolean = false
+    var verbose: Boolean = false
+    var printVersion: Boolean = false
+    var failOnError: Boolean = true
 
-    public var noStdlib: Boolean = false
+    var noStdlib: Boolean = false
 
-    public val additionalArguments: MutableList<Commandline.Argument> = arrayListOf()
+    val additionalArguments: MutableList<Commandline.Argument> = arrayListOf()
 
-    public var exitCode: Int? = null
+    var exitCode: Int? = null
 
-    public fun createSrc(): Path {
+    fun createSrc(): Path {
         val srcPath = src
         if (srcPath == null) {
             val t = Path(getProject())
@@ -53,11 +53,11 @@ public abstract class KotlinCompilerBaseTask : Task() {
         return srcPath.createPath()
     }
 
-    public fun setSrcRef(ref: Reference) {
-        createSrc().setRefid(ref)
+    fun setSrcRef(ref: Reference) {
+        createSrc().refid = ref
     }
 
-    public fun createCompilerArg(): Commandline.Argument {
+    fun createCompilerArg(): Commandline.Argument {
         val argument = Commandline.Argument()
         additionalArguments.add(argument)
         return argument
@@ -65,7 +65,7 @@ public abstract class KotlinCompilerBaseTask : Task() {
 
     abstract fun fillSpecificArguments()
 
-    public fun fillArguments() {
+    fun fillArguments() {
         val sourcePaths = src ?: throw BuildException("\"src\" should be specified")
         args.addAll(sourcePaths.list().map { File(it).canonicalPath })
 
@@ -75,7 +75,7 @@ public abstract class KotlinCompilerBaseTask : Task() {
         if (verbose) args.add("-verbose")
         if (printVersion) args.add("-version")
 
-        args.addAll(additionalArguments.flatMap { it.getParts().toList() })
+        args.addAll(additionalArguments.flatMap { it.parts.toList() })
 
         fillSpecificArguments()
     }
@@ -85,12 +85,12 @@ public abstract class KotlinCompilerBaseTask : Task() {
 
         val compilerClass = KotlinAntTaskUtil.getOrCreateClassLoader().loadClass(compilerFqName)
         val compiler = compilerClass.newInstance()
-        val exec = compilerClass.getMethod("execFullPathsInMessages", javaClass<PrintStream>(), javaClass<Array<String>>())
+        val exec = compilerClass.getMethod("execFullPathsInMessages", PrintStream::class.java, Array<String>::class.java)
 
-        log("Compiling ${src!!.list().toList()} => [${output!!.canonicalPath}]");
+        log("Compiling ${src!!.list().toList()} => [${output!!.canonicalPath}]")
 
         val result = exec(compiler, System.err, args.toTypedArray())
-        exitCode = (result as Enum<*>).ordinal()
+        exitCode = (result as Enum<*>).ordinal
 
         if (failOnError && exitCode != 0) {
             throw BuildException("Compile failed; see the compiler error output for details.")

build-common/build-common.iml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="util.runtime" />
+    <orderEntry type="module" module-name="cli-common" />
+    <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" />
+  </component>
+</module>

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.jps.build
+package org.jetbrains.kotlin.build
 
 import java.io.File
 

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

@@ -0,0 +1,40 @@
+/*
+ * 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.build
+
+import org.jetbrains.kotlin.incremental.LocalFileKotlinClass
+import org.jetbrains.kotlin.load.kotlin.ModuleMapping
+import org.jetbrains.kotlin.utils.sure
+import java.io.File
+
+open class GeneratedFile<Target>(
+        val target: Target,
+        val sourceFiles: Collection<File>,
+        val outputFile: File
+)
+
+class GeneratedJvmClass<Target> (
+        target: Target,
+        sourceFiles: Collection<File>,
+        outputFile: File
+) : GeneratedFile<Target>(target, sourceFiles, outputFile) {
+    val outputClass = LocalFileKotlinClass.create(outputFile).sure {
+        "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations"
+    }
+}
+
+fun File.isModuleMappingFile() = extension == ModuleMapping.MAPPING_FILE_EXT && parentFile.name == "META-INF"

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 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.

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

@@ -0,0 +1,114 @@
+/*
+ * 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.incremental
+
+import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.config.IncrementalCompilation
+import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion
+import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
+import java.io.File
+
+private val NORMAL_VERSION = 8
+private val EXPERIMENTAL_VERSION = 3
+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"
+private val DATA_CONTAINER_VERSION_FILE_NAME = "data-container-format-version.txt"
+
+class CacheVersion(
+        private val ownVersion: Int,
+        private val versionFile: File,
+        private val whenVersionChanged: CacheVersion.Action,
+        private val whenTurnedOn: CacheVersion.Action,
+        private val whenTurnedOff: CacheVersion.Action,
+        isEnabled: ()->Boolean
+) {
+    private val isEnabled by lazy(isEnabled)
+
+    private val actualVersion: Int
+        get() = versionFile.readText().toInt()
+
+    private val expectedVersion: Int
+        get() {
+            val metadata = JvmMetadataVersion.INSTANCE
+            val bytecode = JvmBytecodeBinaryVersion.INSTANCE
+            return ownVersion * 1000000 +
+                   bytecode.major * 10000 + bytecode.minor * 100 +
+                   metadata.major * 1000 + metadata.minor
+        }
+
+    fun checkVersion(): Action =
+            when (versionFile.exists() to isEnabled) {
+                true  to true -> if (actualVersion != expectedVersion) whenVersionChanged else Action.DO_NOTHING
+                false to true -> whenTurnedOn
+                true  to false -> whenTurnedOff
+                else -> Action.DO_NOTHING
+            }
+
+    fun saveIfNeeded() {
+        if (!isEnabled) return
+
+        if (!versionFile.parentFile.exists()) {
+            versionFile.parentFile.mkdirs()
+        }
+
+        versionFile.writeText(expectedVersion.toString())
+    }
+
+    fun clean() {
+        versionFile.delete()
+    }
+
+    @get:TestOnly
+    val formatVersionFile: File
+        get() = versionFile
+
+    // Order of entries is important, because actions are sorted in KotlinBuilder::checkVersions
+    enum class Action {
+        REBUILD_ALL_KOTLIN,
+        REBUILD_CHUNK,
+        CLEAN_NORMAL_CACHES,
+        CLEAN_EXPERIMENTAL_CACHES,
+        CLEAN_DATA_CONTAINER,
+        DO_NOTHING
+    }
+}
+
+fun normalCacheVersion(dataRoot: File): CacheVersion =
+        CacheVersion(ownVersion = NORMAL_VERSION,
+                     versionFile = File(dataRoot, NORMAL_VERSION_FILE_NAME),
+                     whenVersionChanged = CacheVersion.Action.REBUILD_CHUNK,
+                     whenTurnedOn = CacheVersion.Action.REBUILD_CHUNK,
+                     whenTurnedOff = CacheVersion.Action.CLEAN_NORMAL_CACHES,
+                     isEnabled = { IncrementalCompilation.isEnabled() })
+
+fun experimentalCacheVersion(dataRoot: File): CacheVersion =
+        CacheVersion(ownVersion = EXPERIMENTAL_VERSION,
+                     versionFile = File(dataRoot, EXPERIMENTAL_VERSION_FILE_NAME),
+                     whenVersionChanged = CacheVersion.Action.REBUILD_CHUNK,
+                     whenTurnedOn = CacheVersion.Action.REBUILD_CHUNK,
+                     whenTurnedOff = CacheVersion.Action.CLEAN_EXPERIMENTAL_CACHES,
+                     isEnabled = { IncrementalCompilation.isExperimental() })
+
+fun dataContainerCacheVersion(dataRoot: File): CacheVersion =
+        CacheVersion(ownVersion = DATA_CONTAINER_VERSION,
+                     versionFile = File(dataRoot, DATA_CONTAINER_VERSION_FILE_NAME),
+                     whenVersionChanged = CacheVersion.Action.REBUILD_ALL_KOTLIN,
+                     whenTurnedOn = CacheVersion.Action.REBUILD_ALL_KOTLIN,
+                     whenTurnedOff = CacheVersion.Action.CLEAN_DATA_CONTAINER,
+                     isEnabled = { IncrementalCompilation.isExperimental() })

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

@@ -0,0 +1,799 @@
+/*
+ * 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.
+ * 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.incremental
+
+import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName
+import com.intellij.util.SmartList
+import com.intellij.util.io.BooleanDataDescriptor
+import com.intellij.util.io.EnumeratorStringDescriptor
+import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.build.GeneratedJvmClass
+import org.jetbrains.kotlin.config.IncrementalCompilation
+import org.jetbrains.kotlin.incremental.ChangeInfo.MembersChanged
+import org.jetbrains.kotlin.incremental.ChangeInfo.Removed
+import org.jetbrains.kotlin.incremental.storage.*
+import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames
+import org.jetbrains.kotlin.load.kotlin.ModuleMapping
+import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
+import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
+import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.protobuf.MessageLite
+import org.jetbrains.kotlin.resolve.jvm.JvmClassName
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+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
+import java.util.*
+
+val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin"
+
+open class IncrementalCacheImpl<Target>(
+        private val targetDataRoot: File,
+        targetOutputDir: File?,
+        target: Target
+) : BasicMapsOwner(), IncrementalCache {
+    companion object {
+        private val PROTO_MAP = "proto"
+        private val CONSTANTS_MAP = "constants"
+        private val PACKAGE_PARTS = "package-parts"
+        private val MULTIFILE_CLASS_FACADES = "multifile-class-facades"
+        private val MULTIFILE_CLASS_PARTS = "multifile-class-parts"
+        private val SOURCE_TO_CLASSES = "source-to-classes"
+        private val DIRTY_OUTPUT_CLASSES = "dirty-output-classes"
+        private val INLINE_FUNCTIONS = "inline-functions"
+        private val SUBTYPES = "subtypes"
+        private val SUPERTYPES = "supertypes"
+        private val CLASS_FQ_NAME_TO_SOURCE = "class-fq-name-to-source"
+
+        private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT
+    }
+
+    private val baseDir = File(targetDataRoot, KOTLIN_CACHE_DIRECTORY_NAME)
+    private val experimentalMaps = arrayListOf<BasicMap<*, *>>()
+
+    private fun <K, V, M : BasicMap<K, V>> registerExperimentalMap(map: M): M {
+        experimentalMaps.add(map)
+        return registerMap(map)
+    }
+
+    protected val String.storageFile: File
+        get() = File(baseDir, this + "." + CACHE_EXTENSION)
+
+    private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile))
+    private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile))
+    private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile))
+    private val multifileFacadeToParts = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile))
+    private val partToMultifileFacade = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile))
+    private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile))
+    private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile))
+    private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile))
+    private val subtypesMap = registerExperimentalMap(SubtypesMap(SUBTYPES.storageFile))
+    private val supertypesMap = registerExperimentalMap(SupertypesMap(SUPERTYPES.storageFile))
+    private val classFqNameToSourceMap = registerExperimentalMap(ClassFqNameToSourceMap(CLASS_FQ_NAME_TO_SOURCE.storageFile))
+
+    private val dependents = arrayListOf<IncrementalCacheImpl<Target>>()
+    private val outputDir by lazy(LazyThreadSafetyMode.NONE) { requireNotNull(targetOutputDir) { "Target is expected to have output directory: $target" } }
+
+    val thisWithDependentCaches: Iterable<IncrementalCacheImpl<Target>> by lazy {
+        val result = arrayListOf(this)
+        result.addAll(dependents)
+        result
+    }
+
+    override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) {
+    }
+
+    protected open fun debugLog(message: String) {}
+
+    fun addDependentCache(cache: IncrementalCacheImpl<Target>) {
+        dependents.add(cache)
+    }
+
+    fun markOutputClassesDirty(removedAndCompiledSources: List<File>) {
+        for (sourceFile in removedAndCompiledSources) {
+            val classes = sourceToClassesMap[sourceFile]
+            classes.forEach {
+                dirtyOutputClassesMap.markDirty(it.internalName)
+            }
+
+            sourceToClassesMap.clearOutputsForSource(sourceFile)
+        }
+    }
+
+    // used in gradle
+    @Suppress("unused")
+    fun classesBySources(sources: Iterable<File>): Iterable<JvmClassName> =
+            sources.flatMap { sourceToClassesMap[it] }
+
+    fun getSubtypesOf(className: FqName): Sequence<FqName> =
+            subtypesMap[className].asSequence()
+
+    fun getSourceFileIfClass(fqName: FqName): File? = classFqNameToSourceMap[fqName]
+
+    fun isMultifileFacade(className: JvmClassName): Boolean =
+            className.internalName in multifileFacadeToParts
+
+    override fun getClassFilePath(internalClassName: String): String {
+        return toSystemIndependentName(File(outputDir, "$internalClassName.class").canonicalPath)
+    }
+
+    fun saveModuleMappingToCache(sourceFiles: Collection<File>, file: File): CompilationResult {
+        val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)
+        protoMap.process(jvmClassName, file.readBytes(), emptyArray<String>(), isPackage = false, checkChangesIsOpenPart = false)
+        dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME)
+        sourceFiles.forEach { sourceToClassesMap.add(it, jvmClassName) }
+        return CompilationResult.NO_CHANGES
+    }
+
+    open fun saveFileToCache(generatedClass: GeneratedJvmClass<Target>): CompilationResult {
+        val sourceFiles: Collection<File> = generatedClass.sourceFiles
+        val kotlinClass: LocalFileKotlinClass = generatedClass.outputClass
+        val className = kotlinClass.className
+
+        dirtyOutputClassesMap.notDirty(className.internalName)
+        sourceFiles.forEach {
+            sourceToClassesMap.add(it, className)
+        }
+
+        if (kotlinClass.classId.isLocal) {
+            return CompilationResult.NO_CHANGES
+        }
+
+        val header = kotlinClass.classHeader
+        val changesInfo = when (header.kind) {
+            KotlinClassHeader.Kind.FILE_FACADE -> {
+                assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" }
+                packagePartMap.addPackagePart(className)
+
+                protoMap.process(kotlinClass, isPackage = true) +
+                constantsMap.process(kotlinClass, isPackage = true) +
+                inlineFunctionsMap.process(kotlinClass, isPackage = true)
+            }
+            KotlinClassHeader.Kind.MULTIFILE_CLASS -> {
+                val partNames = kotlinClass.classHeader.data?.toList()
+                                ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}")
+                multifileFacadeToParts[className] = partNames
+                // When a class is replaced with a facade with the same name,
+                // the class' proto wouldn't ever be deleted,
+                // because we don't write proto for multifile facades.
+                // As a workaround we can remove proto values for multifile facades.
+                protoMap.remove(className)
+                classFqNameToSourceMap.remove(className.fqNameForClassNameWithoutDollars)
+
+                // TODO NO_CHANGES? (delegates only)
+                constantsMap.process(kotlinClass, isPackage = true) +
+                inlineFunctionsMap.process(kotlinClass, isPackage = true)
+            }
+            KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> {
+                assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" }
+                packagePartMap.addPackagePart(className)
+                partToMultifileFacade.set(className.internalName, header.multifileClassName!!)
+
+                protoMap.process(kotlinClass, isPackage = true) +
+                constantsMap.process(kotlinClass, isPackage = true) +
+                inlineFunctionsMap.process(kotlinClass, isPackage = true)
+            }
+            KotlinClassHeader.Kind.CLASS -> {
+                assert(sourceFiles.size == 1) { "Class is expected to have only one source file: $sourceFiles" }
+                addToClassStorage(kotlinClass, sourceFiles.first())
+
+                protoMap.process(kotlinClass, isPackage = false) +
+                constantsMap.process(kotlinClass, isPackage = false) +
+                inlineFunctionsMap.process(kotlinClass, isPackage = false)
+            }
+            else -> CompilationResult.NO_CHANGES
+        }
+
+        changesInfo.logIfSomethingChanged(className)
+        return changesInfo
+    }
+
+    private fun CompilationResult.logIfSomethingChanged(className: JvmClassName) {
+        if (this == CompilationResult.NO_CHANGES) return
+
+        debugLog("$className is changed: $this")
+    }
+
+    private fun computeChanges(className: JvmClassName, createChangeInfo: (FqName, Collection<String>) -> ChangeInfo): List<ChangeInfo> {
+        fun <T> T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List<MessageLite>): Set<String> =
+                members.flatMap { this.it().filterNot { it.isPrivate }.names(nameResolver) }.toSet()
+
+        if (className.internalName == MODULE_MAPPING_FILE_NAME) return emptyList()
+
+        val mapValue = protoMap[className] ?: return emptyList()
+
+        return when {
+            mapValue.isPackageFacade -> {
+                val packageData = JvmProtoBufUtil.readPackageDataFrom(mapValue.bytes, mapValue.strings)
+
+                val memberNames =
+                        packageData.packageProto.getNonPrivateNames(
+                                packageData.nameResolver,
+                                ProtoBuf.Package::getFunctionList,
+                                ProtoBuf.Package::getPropertyList
+                        )
+
+                listOf(createChangeInfo(className.packageFqName, memberNames))
+            }
+            else -> {
+                val classData = JvmProtoBufUtil.readClassDataFrom(mapValue.bytes, mapValue.strings)
+
+                val classFqName = className.fqNameForClassNameWithoutDollars
+                val kind = Flags.CLASS_KIND.get(classData.classProto.flags)
+
+                if (kind == ProtoBuf.Class.Kind.COMPANION_OBJECT) {
+                    val memberNames =
+                            classData.classProto.getNonPrivateNames(
+                                    classData.nameResolver,
+                                    ProtoBuf.Class::getConstructorList,
+                                    ProtoBuf.Class::getFunctionList,
+                                    ProtoBuf.Class::getPropertyList
+                            ) + classData.classProto.enumEntryList.map { classData.nameResolver.getString(it.name) }
+
+                    val companionObjectChanged = createChangeInfo(classFqName.parent(), classFqName.shortName().asString().singletonOrEmptyList())
+                    val companionObjectMembersChanged = createChangeInfo(classFqName, memberNames)
+
+                    listOf(companionObjectMembersChanged, companionObjectChanged)
+                }
+                else {
+                    listOf(ChangeInfo.SignatureChanged(classFqName, areSubclassesAffected = true))
+                }
+            }
+        }
+    }
+
+    fun clearCacheForRemovedClasses(): CompilationResult {
+        val dirtyClasses = dirtyOutputClassesMap
+                                .getDirtyOutputClasses()
+                                .map(JvmClassName::byInternalName)
+                                .toList()
+
+        val changes =
+                if (IncrementalCompilation.isExperimental())
+                    dirtyClasses.flatMap { computeChanges(it, ::Removed) }.asSequence()
+                else
+                    emptySequence<ChangeInfo>()
+
+        val changesInfo = dirtyClasses.fold(CompilationResult(changes = changes)) { info, className ->
+            val newInfo = CompilationResult(protoChanged = className in protoMap,
+                                            constantsChanged = className in constantsMap)
+            newInfo.logIfSomethingChanged(className)
+            info + newInfo
+        }
+
+        val facadesWithRemovedParts = hashMapOf<JvmClassName, MutableSet<String>>()
+        for (dirtyClass in dirtyClasses) {
+            val facade = partToMultifileFacade.get(dirtyClass.internalName) ?: continue
+            val facadeClassName = JvmClassName.byInternalName(facade)
+            val removedParts = facadesWithRemovedParts.getOrPut(facadeClassName) { hashSetOf() }
+            removedParts.add(dirtyClass.internalName)
+        }
+
+        for ((facade, removedParts) in facadesWithRemovedParts.entries) {
+            val allParts = multifileFacadeToParts[facade.internalName] ?: continue
+            val notRemovedParts = allParts.filter { it !in removedParts }
+
+            if (notRemovedParts.isEmpty()) {
+                multifileFacadeToParts.remove(facade)
+            }
+            else {
+                multifileFacadeToParts[facade] = notRemovedParts
+            }
+        }
+
+        dirtyClasses.forEach {
+            protoMap.remove(it)
+            packagePartMap.remove(it)
+            multifileFacadeToParts.remove(it)
+            partToMultifileFacade.remove(it)
+            constantsMap.remove(it)
+            inlineFunctionsMap.remove(it)
+        }
+
+        removeAllFromClassStorage(dirtyClasses)
+
+        dirtyOutputClassesMap.clean()
+        return changesInfo
+    }
+
+    override fun getObsoletePackageParts(): Collection<String> {
+        val obsoletePackageParts =
+                dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) }
+        debugLog("Obsolete package parts: ${obsoletePackageParts}")
+        return obsoletePackageParts
+    }
+
+    override fun getPackagePartData(partInternalName: String): JvmPackagePartProto? {
+        return protoMap[JvmClassName.byInternalName(partInternalName)]?.let { value ->
+            JvmPackagePartProto(value.bytes, value.strings)
+        }
+    }
+
+    override fun getObsoleteMultifileClasses(): Collection<String> {
+        val obsoleteMultifileClasses = linkedSetOf<String>()
+        for (dirtyClass in dirtyOutputClassesMap.getDirtyOutputClasses()) {
+            val dirtyFacade = partToMultifileFacade.get(dirtyClass) ?: continue
+            obsoleteMultifileClasses.add(dirtyFacade)
+        }
+        debugLog("Obsolete multifile class facades: $obsoleteMultifileClasses")
+        return obsoleteMultifileClasses
+    }
+
+    override fun getStableMultifileFacadeParts(facadeInternalName: String): Collection<String>? {
+        val partNames = multifileFacadeToParts.get(facadeInternalName) ?: return null
+        return partNames.filter { !dirtyOutputClassesMap.isDirty(it) }
+    }
+
+    override fun getMultifileFacade(partInternalName: String): String? {
+        return partToMultifileFacade.get(partInternalName)
+    }
+
+    override fun getModuleMappingData(): ByteArray? {
+        return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)]?.bytes
+    }
+
+    override fun clean() {
+        super.clean()
+        normalCacheVersion(targetDataRoot).clean()
+        experimentalCacheVersion(targetDataRoot).clean()
+    }
+
+    fun cleanExperimental() {
+        experimentalCacheVersion(targetDataRoot).clean()
+        experimentalMaps.forEach { it.clean() }
+    }
+
+    private inner class ProtoMap(storageFile: File) : BasicStringMap<ProtoMapValue>(storageFile, ProtoMapValueExternalizer) {
+
+        fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult {
+            val header = kotlinClass.classHeader
+            val bytes = BitEncoding.decodeBytes(header.data!!)
+            return put(kotlinClass.className, bytes, header.strings!!, isPackage, checkChangesIsOpenPart = true)
+        }
+
+        fun process(className: JvmClassName, data: ByteArray, strings: Array<String>, isPackage: Boolean, checkChangesIsOpenPart: Boolean): CompilationResult {
+            return put(className, data, strings, isPackage, checkChangesIsOpenPart)
+        }
+
+        private fun put(
+                className: JvmClassName, bytes: ByteArray, strings: Array<String>, isPackage: Boolean, checkChangesIsOpenPart: Boolean
+        ): CompilationResult {
+            val key = className.internalName
+            val oldData = storage[key]
+            val data = ProtoMapValue(isPackage, bytes, strings)
+
+            if (oldData == null ||
+                !Arrays.equals(bytes, oldData.bytes) ||
+                !Arrays.equals(strings, oldData.strings) ||
+                isPackage != oldData.isPackageFacade
+            ) {
+                storage[key] = data
+            }
+
+            if (!checkChangesIsOpenPart) return CompilationResult(protoChanged = true)
+
+            if (oldData == null) {
+                val changes =
+                        if (IncrementalCompilation.isExperimental())
+                            computeChanges(className, ::MembersChanged).asSequence()
+                        else
+                            emptySequence<ChangeInfo>()
+
+                return CompilationResult(protoChanged = true, changes = changes)
+            }
+
+            val difference = difference(oldData, data)
+            val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars
+            val changeList = SmartList<ChangeInfo>()
+
+            if (difference.isClassAffected) {
+                changeList.add(ChangeInfo.SignatureChanged(fqName, difference.areSubclassesAffected))
+            }
+
+            if (difference.changedMembersNames.isNotEmpty()) {
+                changeList.add(ChangeInfo.MembersChanged(fqName, difference.changedMembersNames))
+            }
+
+            return CompilationResult(protoChanged = changeList.isNotEmpty(), changes = changeList.asSequence())
+        }
+
+        operator fun contains(className: JvmClassName): Boolean =
+                className.internalName in storage
+
+        operator fun get(className: JvmClassName): ProtoMapValue? =
+                storage[className.internalName]
+
+        fun remove(className: JvmClassName) {
+            storage.remove(className.internalName)
+        }
+
+        override fun dumpValue(value: ProtoMapValue): String {
+            return (if (value.isPackageFacade) "1" else "0") + java.lang.Long.toHexString(value.bytes.md5())
+        }
+    }
+
+    private inner class ConstantsMap(storageFile: File) : BasicStringMap<Map<String, Any>>(storageFile, ConstantsMapExternalizer) {
+        private fun getConstantsMap(bytes: ByteArray): Map<String, Any>? {
+            val result = HashMap<String, Any>()
+
+            ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) {
+                override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? {
+                    val staticFinal = Opcodes.ACC_STATIC or Opcodes.ACC_FINAL or Opcodes.ACC_PRIVATE
+                    if (value != null && access and staticFinal == Opcodes.ACC_STATIC or Opcodes.ACC_FINAL) {
+                        result[name] = value
+                    }
+                    return null
+                }
+            }, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES)
+
+            return if (result.isEmpty()) null else result
+        }
+
+        operator fun contains(className: JvmClassName): Boolean =
+                className.internalName in storage
+
+        fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult {
+            return put(kotlinClass.className, getConstantsMap(kotlinClass.fileContents), isPackage)
+        }
+
+        private fun put(className: JvmClassName, constantsMap: Map<String, Any>?, isPackage: Boolean): CompilationResult {
+            val key = className.internalName
+
+            val oldMap = storage[key]
+            if (oldMap == constantsMap) return CompilationResult.NO_CHANGES
+
+            if (constantsMap != null) {
+                storage[key] = constantsMap
+            }
+            else {
+                remove(className)
+            }
+
+            val changes =
+                    if (!IncrementalCompilation.isExperimental() ||
+                        constantsMap == null || constantsMap.isEmpty() ||
+                        oldMap == null || oldMap.isEmpty()
+                    ) {
+                        emptySequence<ChangeInfo>()
+                    }
+                    else {
+                        // we need only changed constants everything other should be covered by diff
+                        val changedNames = oldMap.filter { constantsMap.containsKey(it.key) && constantsMap[it.key] != it.value }.map { it.key }
+
+                        val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars
+
+                        sequenceOf(ChangeInfo.MembersChanged(fqName, changedNames))
+                    }
+
+            return CompilationResult(constantsChanged = true, changes = changes)
+        }
+
+        fun remove(className: JvmClassName) {
+            storage.remove(className.internalName)
+        }
+
+        override fun dumpValue(value: Map<String, Any>): String =
+                value.dumpMap(Any::toString)
+    }
+
+    private inner class PackagePartMap(storageFile: File) : BasicStringMap<Boolean>(storageFile, BooleanDataDescriptor.INSTANCE) {
+        fun addPackagePart(className: JvmClassName) {
+            storage[className.internalName] = true
+        }
+
+        fun remove(className: JvmClassName) {
+            storage.remove(className.internalName)
+        }
+
+        fun isPackagePart(className: JvmClassName): Boolean =
+                className.internalName in storage
+
+        override fun dumpValue(value: Boolean) = ""
+    }
+
+    private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) {
+        operator fun set(facadeName: JvmClassName, partNames: Collection<String>) {
+            storage[facadeName.internalName] = partNames
+        }
+
+        operator fun get(internalName: String): Collection<String>? = storage[internalName]
+
+        operator fun contains(internalName: String): Boolean = internalName in storage
+
+        fun remove(className: JvmClassName) {
+            storage.remove(className.internalName)
+        }
+
+        override fun dumpValue(value: Collection<String>): String = value.dumpCollection()
+    }
+
+    private inner class MultifileClassPartMap(storageFile: File) : BasicStringMap<String>(storageFile, EnumeratorStringDescriptor.INSTANCE) {
+        fun set(partName: String, facadeName: String) {
+            storage[partName] = facadeName
+        }
+
+        fun get(partName: String): String? {
+            return storage.get(partName)
+        }
+
+        fun remove(className: JvmClassName) {
+            storage.remove(className.internalName)
+        }
+
+        override fun dumpValue(value: String): String = value
+    }
+
+    inner class SourceToClassesMap(storageFile: File) : BasicStringMap<Collection<String>>(storageFile, PathStringDescriptor, StringCollectionExternalizer) {
+        fun clearOutputsForSource(sourceFile: File) {
+            remove(sourceFile.absolutePath)
+        }
+
+        fun add(sourceFile: File, className: JvmClassName) {
+            storage.append(sourceFile.absolutePath, className.internalName)
+        }
+
+        operator fun get(sourceFile: File): Collection<JvmClassName> =
+                storage[sourceFile.absolutePath].orEmpty().map { JvmClassName.byInternalName(it) }
+
+        override fun dumpValue(value: Collection<String>) = value.dumpCollection()
+
+        private fun remove(path: String) {
+            storage.remove(path)
+        }
+    }
+
+    inner class ClassFqNameToSourceMap(storageFile: File) : BasicStringMap<String>(storageFile, EnumeratorStringDescriptor(), PathStringDescriptor) {
+        operator fun set(fqName: FqName, sourceFile: File) {
+            storage[fqName.asString()] = sourceFile.canonicalPath
+        }
+
+        operator fun get(fqName: FqName): File? =
+                storage[fqName.asString()]?.let(::File)
+
+        fun remove(fqName: FqName) {
+            storage.remove(fqName.asString())
+        }
+
+        override fun dumpValue(value: String) = value
+    }
+
+    private fun addToClassStorage(kotlinClass: LocalFileKotlinClass, srcFile: File) {
+        if (!IncrementalCompilation.isExperimental()) return
+
+        val classData = JvmProtoBufUtil.readClassDataFrom(kotlinClass.classHeader.data!!, kotlinClass.classHeader.strings!!)
+        val supertypes = classData.classProto.supertypes(TypeTable(classData.classProto.typeTable))
+        val parents = supertypes.map { classData.nameResolver.getClassId(it.className).asSingleFqName() }
+                                .filter { it.asString() != "kotlin.Any" }
+                                .toSet()
+        val child = kotlinClass.classId.asSingleFqName()
+
+        parents.forEach { subtypesMap.add(it, child) }
+
+        val removedSupertypes = supertypesMap[child].filter { it !in parents }
+        removedSupertypes.forEach { subtypesMap.removeValues(it, setOf(child)) }
+
+        supertypesMap[child] = parents
+        classFqNameToSourceMap[kotlinClass.className.fqNameForClassNameWithoutDollars] = srcFile
+    }
+
+    private fun removeAllFromClassStorage(removedClasses: Collection<JvmClassName>) {
+        if (!IncrementalCompilation.isExperimental() || removedClasses.isEmpty()) return
+
+        val removedFqNames = removedClasses.map { it.fqNameForClassNameWithoutDollars }.toSet()
+
+        for (cache in thisWithDependentCaches) {
+            val parentsFqNames = hashSetOf<FqName>()
+            val childrenFqNames = hashSetOf<FqName>()
+
+            for (removedFqName in removedFqNames) {
+                parentsFqNames.addAll(cache.supertypesMap[removedFqName])
+                childrenFqNames.addAll(cache.subtypesMap[removedFqName])
+
+                cache.supertypesMap.remove(removedFqName)
+                cache.subtypesMap.remove(removedFqName)
+            }
+
+            for (child in childrenFqNames) {
+                cache.supertypesMap.removeValues(child, removedFqNames)
+            }
+
+            for (parent in parentsFqNames) {
+                cache.subtypesMap.removeValues(parent, removedFqNames)
+            }
+        }
+
+        removedFqNames.forEach { classFqNameToSourceMap.remove(it) }
+    }
+
+    private inner class DirtyOutputClassesMap(storageFile: File) : BasicStringMap<Boolean>(storageFile, BooleanDataDescriptor.INSTANCE) {
+        fun markDirty(className: String) {
+            storage[className] = true
+        }
+
+        fun notDirty(className: String) {
+            storage.remove(className)
+        }
+
+        fun getDirtyOutputClasses(): Collection<String> =
+                storage.keys
+
+        fun isDirty(className: String): Boolean =
+                storage.contains(className)
+
+        override fun dumpValue(value: Boolean) = ""
+    }
+
+    private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap<Map<String, Long>>(storageFile, StringToLongMapExternalizer) {
+        private fun getInlineFunctionsMap(header: KotlinClassHeader, bytes: ByteArray): Map<String, Long> {
+            val inlineFunctions = inlineFunctionsJvmNames(header)
+            if (inlineFunctions.isEmpty()) return emptyMap()
+
+            val result = HashMap<String, Long>()
+
+            ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) {
+                override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array<out String>?): MethodVisitor? {
+                    val dummyClassWriter = ClassWriter(Opcodes.ASM5)
+
+                    return object : MethodVisitor(Opcodes.ASM5, dummyClassWriter.visitMethod(0, name, desc, null, exceptions)) {
+                        override fun visitEnd() {
+                            val jvmName = name + desc
+                            if (jvmName !in inlineFunctions) return
+
+                            val dummyBytes = dummyClassWriter.toByteArray()!!
+                            val hash = dummyBytes.md5()
+                            result[jvmName] = hash
+                        }
+                    }
+                }
+
+            }, 0)
+
+            return result
+        }
+
+        fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult {
+            return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.classHeader, kotlinClass.fileContents), isPackage)
+        }
+
+        private fun put(className: JvmClassName, newMap: Map<String, Long>, isPackage: Boolean): CompilationResult {
+            val internalName = className.internalName
+            val oldMap = storage[internalName] ?: emptyMap()
+
+            val added = hashSetOf<String>()
+            val changed = hashSetOf<String>()
+            val allFunctions = oldMap.keys + newMap.keys
+
+            for (fn in allFunctions) {
+                val oldHash = oldMap[fn]
+                val newHash = newMap[fn]
+
+                when {
+                    oldHash == null -> added.add(fn)
+                    oldHash != newHash -> changed.add(fn)
+                }
+            }
+
+            when {
+                newMap.isNotEmpty() -> storage[internalName] = newMap
+                else -> storage.remove(internalName)
+            }
+
+            val changes =
+                    if (IncrementalCompilation.isExperimental()) {
+                        val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars
+                        // TODO get name in better way instead of using substringBefore
+                        (added.asSequence() + changed.asSequence()).map { ChangeInfo.MembersChanged(fqName, listOf(it.substringBefore("("))) }
+                    }
+                    else {
+                        emptySequence<ChangeInfo>()
+                    }
+
+            processChangedInlineFunctions(className, changed)
+            return CompilationResult(inlineChanged = changed.isNotEmpty(),
+                                     inlineAdded = added.isNotEmpty(),
+                                     changes = changes)
+        }
+
+        fun remove(className: JvmClassName) {
+            storage.remove(className.internalName)
+        }
+
+        override fun dumpValue(value: Map<String, Long>): String =
+                value.dumpMap { java.lang.Long.toHexString(it) }
+    }
+
+    protected open fun processChangedInlineFunctions(
+            className: JvmClassName,
+            changedFunctions: Collection<String>
+    ) {
+    }
+}
+
+sealed class ChangeInfo(val fqName: FqName) {
+    open class MembersChanged(fqName: FqName, val names: Collection<String>) : ChangeInfo(fqName) {
+        override fun toStringProperties(): String = super.toStringProperties() + ", names = $names"
+    }
+
+    class Removed(fqName: FqName, names: Collection<String>) : MembersChanged(fqName, names)
+
+    class SignatureChanged(fqName: FqName, val areSubclassesAffected: Boolean) : ChangeInfo(fqName)
+
+
+    protected open fun toStringProperties(): String = "fqName = $fqName"
+
+    override fun toString(): String {
+        return this.javaClass.simpleName + "(${toStringProperties()})"
+    }
+}
+
+data class CompilationResult(
+        val protoChanged: Boolean = false,
+        val constantsChanged: Boolean = false,
+        val inlineChanged: Boolean = false,
+        val inlineAdded: Boolean = false,
+        val changes: Sequence<ChangeInfo> = emptySequence()
+) {
+    companion object {
+        val NO_CHANGES: CompilationResult = CompilationResult()
+    }
+
+    operator fun plus(other: CompilationResult): CompilationResult =
+            CompilationResult(protoChanged || other.protoChanged,
+                              constantsChanged || other.constantsChanged,
+                              inlineChanged || other.inlineChanged,
+                              inlineAdded || other.inlineAdded,
+                              changes + other.changes)
+}
+
+fun ByteArray.md5(): Long {
+    val d = MessageDigest.getInstance("MD5").digest(this)!!
+    return ((d[0].toLong() and 0xFFL)
+            or ((d[1].toLong() and 0xFFL) shl 8)
+            or ((d[2].toLong() and 0xFFL) shl 16)
+            or ((d[3].toLong() and 0xFFL) shl 24)
+            or ((d[4].toLong() and 0xFFL) shl 32)
+            or ((d[5].toLong() and 0xFFL) shl 40)
+            or ((d[6].toLong() and 0xFFL) shl 48)
+            or ((d[7].toLong() and 0xFFL) shl 56)
+           )
+}
+
+@TestOnly
+fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): String =
+        buildString {
+            append("{")
+            for (key in keys.sorted()) {
+                if (length != 1) {
+                    append(", ")
+                }
+
+                val value = get(key)?.let(dumpValue) ?: "null"
+                append("$key -> $value")
+            }
+            append("}")
+        }
+
+@TestOnly fun <T : Comparable<T>> Collection<T>.dumpCollection(): String =
+        "[${sorted().joinToString(", ", transform = Any::toString)}]"

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

@@ -14,22 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.jps.incremental
+package org.jetbrains.kotlin.incremental
 
-import org.jetbrains.jps.incremental.ModuleBuildTarget
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
 import org.jetbrains.kotlin.modules.TargetId
 
-public class IncrementalCompilationComponentsImpl(
-        caches: Map<ModuleBuildTarget, IncrementalCache>,
+class IncrementalCompilationComponentsImpl(
+        private val caches: Map<TargetId, IncrementalCache>,
         private val lookupTracker: LookupTracker
 ): IncrementalCompilationComponents {
-    private val caches = caches.mapKeys { TargetId(it.key) }
-
     override fun getIncrementalCache(target: TargetId): IncrementalCache =
-            caches[target]!!
+            caches[target] ?: throw Exception("Incremental cache for target ${target.name} not found")
 
     override fun getLookupTracker(): LookupTracker = lookupTracker
 }

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.jps.incremental
+package org.jetbrains.kotlin.incremental
 
 import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
@@ -26,23 +26,25 @@ class LocalFileKotlinClass private constructor(
         private val file: File,
         private val fileContents: ByteArray,
         className: ClassId,
+        classVersion: Int,
         classHeader: KotlinClassHeader,
-        innerClasses: FileBasedKotlinClass.InnerClassesInfo
-) : FileBasedKotlinClass(className, classHeader, innerClasses) {
+        innerClasses: InnerClassesInfo
+) : FileBasedKotlinClass(className, classVersion, classHeader, innerClasses) {
 
     companion object {
         fun create(file: File): LocalFileKotlinClass? {
             val fileContents = file.readBytes()
             return FileBasedKotlinClass.create(fileContents) {
-                className, classHeader, innerClasses ->
-                LocalFileKotlinClass(file, fileContents, className, classHeader, innerClasses)
+                className, classVersion, classHeader, innerClasses ->
+                LocalFileKotlinClass(file, fileContents, className, classVersion, classHeader, innerClasses)
             }
         }
     }
 
-    public val className: JvmClassName by lazy { JvmClassName.byClassId(classId) }
+    val className: JvmClassName by lazy { JvmClassName.byClassId(classId) }
 
-    override fun getLocation(): String = file.absolutePath
+    override val location: String
+        get() = file.absolutePath
 
     public override fun getFileContents(): ByteArray = fileContents
 

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

@@ -0,0 +1,217 @@
+/*
+ * 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.incremental
+
+import com.intellij.util.containers.MultiMap
+import com.intellij.util.containers.StringInterner
+import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.incremental.components.LookupTracker
+import org.jetbrains.kotlin.incremental.components.Position
+import org.jetbrains.kotlin.incremental.components.ScopeKind
+import org.jetbrains.kotlin.incremental.storage.*
+import org.jetbrains.kotlin.utils.Printer
+import org.jetbrains.kotlin.utils.keysToMap
+import java.io.File
+import java.util.*
+
+
+open class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() {
+    companion object {
+        private val DELETED_TO_SIZE_TRESHOLD = 0.5
+        private val MINIMUM_GARBAGE_COLLECTIBLE_SIZE = 10000
+    }
+
+    private val String.storageFile: File
+        get() = File(targetDataDir, this + "." + CACHE_EXTENSION)
+
+    private val countersFile = "counters".storageFile
+    private val idToFile = registerMap(IdToFileMap("id-to-file".storageFile))
+    private val fileToId = registerMap(FileToIdMap("file-to-id".storageFile))
+    private val lookupMap = registerMap(LookupMap("lookups".storageFile))
+
+    @Volatile
+    private var size: Int = 0
+
+    @Volatile
+    private var deletedCount: Int = 0
+
+    init {
+        if (countersFile.exists()) {
+            val lines = countersFile.readLines()
+            size = lines[0].toInt()
+            deletedCount = lines[1].toInt()
+        }
+    }
+
+    @Synchronized
+    fun get(lookupSymbol: LookupSymbol): Collection<String> {
+        val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope)
+        val fileIds = lookupMap[key] ?: return emptySet()
+
+        return fileIds.mapNotNull {
+            // null means it's outdated
+            idToFile[it]?.path
+        }
+    }
+
+    @Synchronized
+    fun addAll(lookups: Set<Map.Entry<LookupSymbol, Collection<String>>>, allPaths: Set<String>) {
+        val pathToId = allPaths.keysToMap { addFileIfNeeded(File(it)) }
+
+        for ((lookupSymbol, paths) in lookups) {
+            val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope)
+            val fileIds = paths.mapTo(HashSet<Int>()) { pathToId[it]!! }
+            fileIds.addAll(lookupMap[key] ?: emptySet())
+            lookupMap[key] = fileIds
+        }
+    }
+
+    @Synchronized
+    fun removeLookupsFrom(files: Sequence<File>) {
+        for (file in files) {
+            val id = fileToId[file] ?: continue
+            idToFile.remove(id)
+            fileToId.remove(file)
+            deletedCount++
+        }
+    }
+
+    @Synchronized
+    override fun clean() {
+        if (countersFile.exists()) {
+            countersFile.delete()
+        }
+
+        size = 0
+        deletedCount = 0
+
+        super.clean()
+    }
+
+    @Synchronized
+    override fun flush(memoryCachesOnly: Boolean) {
+        try {
+            removeGarbageIfNeeded()
+
+            if (size > 0) {
+                if (!countersFile.exists()) {
+                    countersFile.parentFile.mkdirs()
+                    countersFile.createNewFile()
+                }
+
+                countersFile.writeText("$size\n$deletedCount")
+            }
+        }
+        finally {
+            super.flush(memoryCachesOnly)
+        }
+    }
+
+    private fun addFileIfNeeded(file: File): Int {
+        val existing = fileToId[file]
+        if (existing != null) return existing
+
+        val id = size++
+        fileToId[file] = id
+        idToFile[id] = file
+        return id
+    }
+
+    private fun removeGarbageIfNeeded(force: Boolean = false) {
+        if (force || (size > MINIMUM_GARBAGE_COLLECTIBLE_SIZE && deletedCount.toDouble() / size > DELETED_TO_SIZE_TRESHOLD)) {
+            doRemoveGarbage()
+        }
+    }
+
+    private fun doRemoveGarbage() {
+        for (hash in lookupMap.keys) {
+            lookupMap[hash] = lookupMap[hash]!!.filter { it in idToFile }.toSet()
+        }
+
+        val oldFileToId = fileToId.toMap()
+        val oldIdToNewId = HashMap<Int, Int>(oldFileToId.size)
+        idToFile.clean()
+        fileToId.clean()
+        size = 0
+        deletedCount = 0
+
+        for ((file, oldId) in oldFileToId.entries) {
+            val newId = addFileIfNeeded(file)
+            oldIdToNewId[oldId] = newId
+        }
+
+        for (lookup in lookupMap.keys) {
+            val fileIds = lookupMap[lookup]!!.mapNotNull { oldIdToNewId[it] }.toSet()
+
+            if (fileIds.isEmpty()) {
+                lookupMap.remove(lookup)
+            }
+            else {
+                lookupMap[lookup] = fileIds
+            }
+        }
+    }
+
+    @TestOnly fun forceGC() {
+        removeGarbageIfNeeded(force = true)
+        flush(false)
+    }
+
+    @TestOnly fun dump(lookupSymbols: Set<LookupSymbol>, basePath: File? = null): String {
+        flush(false)
+
+        val sb = StringBuilder()
+        val p = Printer(sb)
+        val lookupsStrings = lookupSymbols.groupBy { LookupSymbolKey(it.name, it.scope) }
+
+        for (lookup in lookupMap.keys.sorted()) {
+            val fileIds = lookupMap[lookup]!!
+
+            val key = if (lookup in lookupsStrings) {
+                lookupsStrings[lookup]!!.map { "${it.scope}#${it.name}" }.sorted().joinToString(", ")
+            }
+            else {
+                lookup.toString()
+            }
+
+            val value = fileIds.map { idToFile[it]?.let { if (basePath == null) it.absolutePath else it.toRelativeString(basePath) } ?: it.toString() }.sorted().joinToString(", ")
+            p.println("$key -> $value")
+        }
+
+        return sb.toString()
+    }
+}
+
+class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker {
+    val lookups = MultiMap<LookupSymbol, String>()
+    val pathInterner = StringInterner()
+    private val interner = StringInterner()
+
+    override val requiresPosition: Boolean
+        get() = delegate.requiresPosition
+
+    override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
+        val internedScopeFqName = interner.intern(scopeFqName)
+        val internedName = interner.intern(name)
+        val internedFilePath = pathInterner.intern(filePath)
+
+        lookups.putValue(LookupSymbol(internedName, internedScopeFqName), internedFilePath)
+        delegate.record(internedFilePath, position, internedScopeFqName, scopeKind, internedName)
+    }
+}
+
+data class LookupSymbol(val name: String, val scope: String)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.jps.incremental
+package org.jetbrains.kotlin.incremental
 
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.serialization.ProtoBuf
@@ -25,12 +25,12 @@ import java.util.*
 
 /** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */
 
-open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, public val newNameResolver: NameResolver) {
+open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameResolver: NameResolver) {
     private val strings = Interner<String>()
-    public val oldStringIndexesMap: MutableMap<Int, Int> = hashMapOf()
-    public val newStringIndexesMap: MutableMap<Int, Int> = hashMapOf()
-    public val oldClassIdIndexesMap: MutableMap<Int, Int> = hashMapOf()
-    public val newClassIdIndexesMap: MutableMap<Int, Int> = hashMapOf()
+    val oldStringIndexesMap: MutableMap<Int, Int> = hashMapOf()
+    val newStringIndexesMap: MutableMap<Int, Int> = hashMapOf()
+    val oldClassIdIndexesMap: MutableMap<Int, Int> = hashMapOf()
+    val newClassIdIndexesMap: MutableMap<Int, Int> = hashMapOf()
 
     private val classIds = Interner<ClassId>()
 
@@ -39,31 +39,47 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
 
         if (!checkEqualsPackageProperty(old, new)) return false
 
+        if (!checkEqualsPackageTypeAlias(old, new)) return false
+
         if (old.hasTypeTable() != new.hasTypeTable()) return false
         if (old.hasTypeTable()) {
             if (!checkEquals(old.typeTable, new.typeTable)) return false
         }
 
+        if (old.hasExtension(JvmProtoBuf.packageModuleName) != new.hasExtension(JvmProtoBuf.packageModuleName)) return false
+        if (old.hasExtension(JvmProtoBuf.packageModuleName)) {
+            if (!checkStringEquals(old.getExtension(JvmProtoBuf.packageModuleName), new.getExtension(JvmProtoBuf.packageModuleName))) return false
+        }
+
         return true
     }
-    public enum class ProtoBufPackageKind {
+    enum class ProtoBufPackageKind {
         FUNCTION_LIST,
         PROPERTY_LIST,
-        TYPE_TABLE
+        TYPE_ALIAS_LIST,
+        TYPE_TABLE,
+        PACKAGE_MODULE_NAME
     }
 
-    public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet<ProtoBufPackageKind> {
+    fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet<ProtoBufPackageKind> {
         val result = EnumSet.noneOf(ProtoBufPackageKind::class.java)
 
         if (!checkEqualsPackageFunction(old, new)) result.add(ProtoBufPackageKind.FUNCTION_LIST)
 
         if (!checkEqualsPackageProperty(old, new)) result.add(ProtoBufPackageKind.PROPERTY_LIST)
 
+        if (!checkEqualsPackageTypeAlias(old, new)) result.add(ProtoBufPackageKind.TYPE_ALIAS_LIST)
+
         if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufPackageKind.TYPE_TABLE)
         if (old.hasTypeTable()) {
             if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufPackageKind.TYPE_TABLE)
         }
 
+        if (old.hasExtension(JvmProtoBuf.packageModuleName) != new.hasExtension(JvmProtoBuf.packageModuleName)) result.add(ProtoBufPackageKind.PACKAGE_MODULE_NAME)
+        if (old.hasExtension(JvmProtoBuf.packageModuleName)) {
+            if (!checkStringEquals(old.getExtension(JvmProtoBuf.packageModuleName), new.getExtension(JvmProtoBuf.packageModuleName))) result.add(ProtoBufPackageKind.PACKAGE_MODULE_NAME)
+        }
+
         return result
     }
 
@@ -94,6 +110,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
 
         if (!checkEqualsClassProperty(old, new)) return false
 
+        if (!checkEqualsClassTypeAlias(old, new)) return false
+
         if (!checkEqualsClassEnumEntry(old, new)) return false
 
         if (old.hasTypeTable() != new.hasTypeTable()) return false
@@ -101,15 +119,14 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (!checkEquals(old.typeTable, new.typeTable)) return false
         }
 
-        if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) return false
-
-        for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) return false
+        if (old.hasExtension(JvmProtoBuf.classModuleName) != new.hasExtension(JvmProtoBuf.classModuleName)) return false
+        if (old.hasExtension(JvmProtoBuf.classModuleName)) {
+            if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) return false
         }
 
         return true
     }
-    public enum class ProtoBufClassKind {
+    enum class ProtoBufClassKind {
         FLAGS,
         FQ_NAME,
         COMPANION_OBJECT_NAME,
@@ -120,12 +137,13 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         CONSTRUCTOR_LIST,
         FUNCTION_LIST,
         PROPERTY_LIST,
+        TYPE_ALIAS_LIST,
         ENUM_ENTRY_LIST,
         TYPE_TABLE,
-        CLASS_ANNOTATION_LIST
+        CLASS_MODULE_NAME
     }
 
-    public fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet<ProtoBufClassKind> {
+    fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet<ProtoBufClassKind> {
         val result = EnumSet.noneOf(ProtoBufClassKind::class.java)
 
         if (old.hasFlags() != new.hasFlags()) result.add(ProtoBufClassKind.FLAGS)
@@ -154,6 +172,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
 
         if (!checkEqualsClassProperty(old, new)) result.add(ProtoBufClassKind.PROPERTY_LIST)
 
+        if (!checkEqualsClassTypeAlias(old, new)) result.add(ProtoBufClassKind.TYPE_ALIAS_LIST)
+
         if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST)
 
         if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufClassKind.TYPE_TABLE)
@@ -161,10 +181,9 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufClassKind.TYPE_TABLE)
         }
 
-        if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST)
-
-        for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST)
+        if (old.hasExtension(JvmProtoBuf.classModuleName) != new.hasExtension(JvmProtoBuf.classModuleName)) result.add(ProtoBufClassKind.CLASS_MODULE_NAME)
+        if (old.hasExtension(JvmProtoBuf.classModuleName)) {
+            if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) result.add(ProtoBufClassKind.CLASS_MODULE_NAME)
         }
 
         return result
@@ -176,6 +195,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (old.flags != new.flags) return false
         }
 
+        if (old.hasOldFlags() != new.hasOldFlags()) return false
+        if (old.hasOldFlags()) {
+            if (old.oldFlags != new.oldFlags) return false
+        }
+
         if (!checkStringEquals(old.name, new.name)) return false
 
         if (old.hasReturnType() != new.hasReturnType()) return false
@@ -212,11 +236,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false
         }
 
-        if (old.hasExtension(JvmProtoBuf.methodImplClassName) != new.hasExtension(JvmProtoBuf.methodImplClassName)) return false
-        if (old.hasExtension(JvmProtoBuf.methodImplClassName)) {
-            if (!checkStringEquals(old.getExtension(JvmProtoBuf.methodImplClassName), new.getExtension(JvmProtoBuf.methodImplClassName))) return false
-        }
-
         return true
     }
 
@@ -226,6 +245,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (old.flags != new.flags) return false
         }
 
+        if (old.hasOldFlags() != new.hasOldFlags()) return false
+        if (old.hasOldFlags()) {
+            if (old.oldFlags != new.oldFlags) return false
+        }
+
         if (!checkStringEquals(old.name, new.name)) return false
 
         if (old.hasReturnType() != new.hasReturnType()) return false
@@ -270,11 +294,41 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (!checkEquals(old.getExtension(JvmProtoBuf.propertySignature), new.getExtension(JvmProtoBuf.propertySignature))) return false
         }
 
-        if (old.hasExtension(JvmProtoBuf.propertyImplClassName) != new.hasExtension(JvmProtoBuf.propertyImplClassName)) return false
-        if (old.hasExtension(JvmProtoBuf.propertyImplClassName)) {
-            if (!checkStringEquals(old.getExtension(JvmProtoBuf.propertyImplClassName), new.getExtension(JvmProtoBuf.propertyImplClassName))) return false
+        return true
+    }
+
+    open fun checkEquals(old: ProtoBuf.TypeAlias, new: ProtoBuf.TypeAlias): Boolean {
+        if (old.hasFlags() != new.hasFlags()) return false
+        if (old.hasFlags()) {
+            if (old.flags != new.flags) return false
         }
 
+        if (!checkStringEquals(old.name, new.name)) return false
+
+        if (!checkEqualsTypeAliasTypeParameter(old, new)) return false
+
+        if (old.hasUnderlyingType() != new.hasUnderlyingType()) return false
+        if (old.hasUnderlyingType()) {
+            if (!checkEquals(old.underlyingType, new.underlyingType)) return false
+        }
+
+        if (old.hasUnderlyingTypeId() != new.hasUnderlyingTypeId()) return false
+        if (old.hasUnderlyingTypeId()) {
+            if (old.underlyingTypeId != new.underlyingTypeId) return false
+        }
+
+        if (old.hasExpandedType() != new.hasExpandedType()) return false
+        if (old.hasExpandedType()) {
+            if (!checkEquals(old.expandedType, new.expandedType)) return false
+        }
+
+        if (old.hasExpandedTypeId() != new.hasExpandedTypeId()) return false
+        if (old.hasExpandedTypeId()) {
+            if (old.expandedTypeId != new.expandedTypeId) return false
+        }
+
+        if (!checkEqualsTypeAliasAnnotation(old, new)) return false
+
         return true
     }
 
@@ -355,6 +409,31 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (!checkStringEquals(old.typeParameterName, new.typeParameterName)) return false
         }
 
+        if (old.hasTypeAliasName() != new.hasTypeAliasName()) return false
+        if (old.hasTypeAliasName()) {
+            if (!checkClassIdEquals(old.typeAliasName, new.typeAliasName)) return false
+        }
+
+        if (old.hasOuterType() != new.hasOuterType()) return false
+        if (old.hasOuterType()) {
+            if (!checkEquals(old.outerType, new.outerType)) return false
+        }
+
+        if (old.hasOuterTypeId() != new.hasOuterTypeId()) return false
+        if (old.hasOuterTypeId()) {
+            if (old.outerTypeId != new.outerTypeId) return false
+        }
+
+        if (old.hasAbbreviatedType() != new.hasAbbreviatedType()) return false
+        if (old.hasAbbreviatedType()) {
+            if (!checkEquals(old.abbreviatedType, new.abbreviatedType)) return false
+        }
+
+        if (old.hasAbbreviatedTypeId() != new.hasAbbreviatedTypeId()) return false
+        if (old.hasAbbreviatedTypeId()) {
+            if (old.abbreviatedTypeId != new.abbreviatedTypeId) return false
+        }
+
         if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false
 
         for(i in 0..old.getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) {
@@ -385,10 +464,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
-    open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean {
-        if (!checkClassIdEquals(old.id, new.id)) return false
-
-        if (!checkEqualsAnnotationArgument(old, new)) return false
+    open fun checkEquals(old: ProtoBuf.EnumEntry, new: ProtoBuf.EnumEntry): Boolean {
+        if (old.hasName() != new.hasName()) return false
+        if (old.hasName()) {
+            if (!checkStringEquals(old.name, new.name)) return false
+        }
 
         return true
     }
@@ -421,11 +501,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (old.varargElementTypeId != new.varargElementTypeId) return false
         }
 
-        if (old.hasExtension(JvmProtoBuf.index) != new.hasExtension(JvmProtoBuf.index)) return false
-        if (old.hasExtension(JvmProtoBuf.index)) {
-            if (old.getExtension(JvmProtoBuf.index) != new.getExtension(JvmProtoBuf.index)) return false
-        }
-
         return true
     }
 
@@ -467,6 +542,14 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
+    open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean {
+        if (!checkClassIdEquals(old.id, new.id)) return false
+
+        if (!checkEqualsAnnotationArgument(old, new)) return false
+
+        return true
+    }
+
     open fun checkEquals(old: ProtoBuf.Type.Argument, new: ProtoBuf.Type.Argument): Boolean {
         if (old.hasProjection() != new.hasProjection()) return false
         if (old.hasProjection()) {
@@ -486,14 +569,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
-    open fun checkEquals(old: ProtoBuf.Annotation.Argument, new: ProtoBuf.Annotation.Argument): Boolean {
-        if (!checkStringEquals(old.nameId, new.nameId)) return false
-
-        if (!checkEquals(old.value, new.value)) return false
-
-        return true
-    }
-
     open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean {
         if (old.hasName() != new.hasName()) return false
         if (old.hasName()) {
@@ -505,10 +580,13 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (!checkStringEquals(old.desc, new.desc)) return false
         }
 
-        if (old.hasIsStaticInOuter() != new.hasIsStaticInOuter()) return false
-        if (old.hasIsStaticInOuter()) {
-            if (old.isStaticInOuter != new.isStaticInOuter) return false
-        }
+        return true
+    }
+
+    open fun checkEquals(old: ProtoBuf.Annotation.Argument, new: ProtoBuf.Annotation.Argument): Boolean {
+        if (!checkStringEquals(old.nameId, new.nameId)) return false
+
+        if (!checkEquals(old.value, new.value)) return false
 
         return true
     }
@@ -579,6 +657,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
+    open fun checkEqualsPackageTypeAlias(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean {
+        if (old.typeAliasCount != new.typeAliasCount) return false
+
+        for(i in 0..old.typeAliasCount - 1) {
+            if (!checkEquals(old.getTypeAlias(i), new.getTypeAlias(i))) return false
+        }
+
+        return true
+    }
+
     open fun checkEqualsClassTypeParameter(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
         if (old.typeParameterCount != new.typeParameterCount) return false
 
@@ -649,11 +737,21 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
+    open fun checkEqualsClassTypeAlias(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
+        if (old.typeAliasCount != new.typeAliasCount) return false
+
+        for(i in 0..old.typeAliasCount - 1) {
+            if (!checkEquals(old.getTypeAlias(i), new.getTypeAlias(i))) return false
+        }
+
+        return true
+    }
+
     open fun checkEqualsClassEnumEntry(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
         if (old.enumEntryCount != new.enumEntryCount) return false
 
         for(i in 0..old.enumEntryCount - 1) {
-            if (!checkStringEquals(old.getEnumEntry(i), new.getEnumEntry(i))) return false
+            if (!checkEquals(old.getEnumEntry(i), new.getEnumEntry(i))) return false
         }
 
         return true
@@ -689,6 +787,26 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
+    open fun checkEqualsTypeAliasTypeParameter(old: ProtoBuf.TypeAlias, new: ProtoBuf.TypeAlias): Boolean {
+        if (old.typeParameterCount != new.typeParameterCount) return false
+
+        for(i in 0..old.typeParameterCount - 1) {
+            if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false
+        }
+
+        return true
+    }
+
+    open fun checkEqualsTypeAliasAnnotation(old: ProtoBuf.TypeAlias, new: ProtoBuf.TypeAlias): Boolean {
+        if (old.annotationCount != new.annotationCount) return false
+
+        for(i in 0..old.annotationCount - 1) {
+            if (!checkEquals(old.getAnnotation(i), new.getAnnotation(i))) return false
+        }
+
+        return true
+    }
+
     open fun checkEqualsTypeTableType(old: ProtoBuf.TypeTable, new: ProtoBuf.TypeTable): Boolean {
         if (old.typeCount != new.typeCount) return false
 
@@ -759,10 +877,10 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
-    public fun oldGetIndexOfString(index: Int): Int = getIndexOfString(index, oldStringIndexesMap, oldNameResolver)
-    public fun newGetIndexOfString(index: Int): Int = getIndexOfString(index, newStringIndexesMap, newNameResolver)
+    fun oldGetIndexOfString(index: Int): Int = getIndexOfString(index, oldStringIndexesMap, oldNameResolver)
+    fun newGetIndexOfString(index: Int): Int = getIndexOfString(index, newStringIndexesMap, newNameResolver)
 
-    public fun getIndexOfString(index: Int, map: MutableMap<Int, Int>, nameResolver: NameResolver): Int {
+    fun getIndexOfString(index: Int, map: MutableMap<Int, Int>, nameResolver: NameResolver): Int {
         map[index]?.let { return it }
 
         val result = strings.intern(nameResolver.getString(index))
@@ -770,10 +888,10 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return result
     }
 
-    public fun oldGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, oldClassIdIndexesMap, oldNameResolver)
-    public fun newGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, newClassIdIndexesMap, newNameResolver)
+    fun oldGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, oldClassIdIndexesMap, oldNameResolver)
+    fun newGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, newClassIdIndexesMap, newNameResolver)
 
-    public fun getIndexOfClassId(index: Int, map: MutableMap<Int, Int>, nameResolver: NameResolver): Int {
+    fun getIndexOfClassId(index: Int, map: MutableMap<Int, Int>, nameResolver: NameResolver): Int {
         map[index]?.let { return it }
 
         val result = classIds.intern(nameResolver.getClassId(index))
@@ -790,7 +908,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
     }
 }
 
-public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     for(i in 0..functionCount - 1) {
@@ -801,14 +919,22 @@ public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes:
         hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes)
     }
 
+    for(i in 0..typeAliasCount - 1) {
+        hashCode = 31 * hashCode + getTypeAlias(i).hashCode(stringIndexes, fqNameIndexes)
+    }
+
     if (hasTypeTable()) {
         hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes)
     }
 
+    if (hasExtension(JvmProtoBuf.packageModuleName)) {
+        hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.packageModuleName))
+    }
+
     return hashCode
 }
 
-public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasFlags()) {
@@ -849,28 +975,36 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (
         hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes)
     }
 
+    for(i in 0..typeAliasCount - 1) {
+        hashCode = 31 * hashCode + getTypeAlias(i).hashCode(stringIndexes, fqNameIndexes)
+    }
+
     for(i in 0..enumEntryCount - 1) {
-        hashCode = 31 * hashCode + stringIndexes(getEnumEntry(i))
+        hashCode = 31 * hashCode + getEnumEntry(i).hashCode(stringIndexes, fqNameIndexes)
     }
 
     if (hasTypeTable()) {
         hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes)
     }
 
-    for(i in 0..getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
-        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
+    if (hasExtension(JvmProtoBuf.classModuleName)) {
+        hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.classModuleName))
     }
 
     return hashCode
 }
 
-public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasFlags()) {
         hashCode = 31 * hashCode + flags
     }
 
+    if (hasOldFlags()) {
+        hashCode = 31 * hashCode + oldFlags
+    }
+
     hashCode = 31 * hashCode + stringIndexes(name)
 
     if (hasReturnType()) {
@@ -905,20 +1039,20 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes
         hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes)
     }
 
-    if (hasExtension(JvmProtoBuf.methodImplClassName)) {
-        hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.methodImplClassName))
-    }
-
     return hashCode
 }
 
-public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasFlags()) {
         hashCode = 31 * hashCode + flags
     }
 
+    if (hasOldFlags()) {
+        hashCode = 31 * hashCode + oldFlags
+    }
+
     hashCode = 31 * hashCode + stringIndexes(name)
 
     if (hasReturnType()) {
@@ -957,14 +1091,46 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes
         hashCode = 31 * hashCode + getExtension(JvmProtoBuf.propertySignature).hashCode(stringIndexes, fqNameIndexes)
     }
 
-    if (hasExtension(JvmProtoBuf.propertyImplClassName)) {
-        hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.propertyImplClassName))
+    return hashCode
+}
+
+fun ProtoBuf.TypeAlias.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+    var hashCode = 1
+
+    if (hasFlags()) {
+        hashCode = 31 * hashCode + flags
+    }
+
+    hashCode = 31 * hashCode + stringIndexes(name)
+
+    for(i in 0..typeParameterCount - 1) {
+        hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes)
+    }
+
+    if (hasUnderlyingType()) {
+        hashCode = 31 * hashCode + underlyingType.hashCode(stringIndexes, fqNameIndexes)
+    }
+
+    if (hasUnderlyingTypeId()) {
+        hashCode = 31 * hashCode + underlyingTypeId
+    }
+
+    if (hasExpandedType()) {
+        hashCode = 31 * hashCode + expandedType.hashCode(stringIndexes, fqNameIndexes)
+    }
+
+    if (hasExpandedTypeId()) {
+        hashCode = 31 * hashCode + expandedTypeId
+    }
+
+    for(i in 0..annotationCount - 1) {
+        hashCode = 31 * hashCode + getAnnotation(i).hashCode(stringIndexes, fqNameIndexes)
     }
 
     return hashCode
 }
 
-public fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     for(i in 0..typeCount - 1) {
@@ -978,7 +1144,7 @@ public fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexe
     return hashCode
 }
 
-public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     hashCode = 31 * hashCode + id
@@ -1008,7 +1174,7 @@ public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIn
     return hashCode
 }
 
-public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     for(i in 0..argumentCount - 1) {
@@ -1043,6 +1209,26 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I
         hashCode = 31 * hashCode + stringIndexes(typeParameterName)
     }
 
+    if (hasTypeAliasName()) {
+        hashCode = 31 * hashCode + fqNameIndexes(typeAliasName)
+    }
+
+    if (hasOuterType()) {
+        hashCode = 31 * hashCode + outerType.hashCode(stringIndexes, fqNameIndexes)
+    }
+
+    if (hasOuterTypeId()) {
+        hashCode = 31 * hashCode + outerTypeId
+    }
+
+    if (hasAbbreviatedType()) {
+        hashCode = 31 * hashCode + abbreviatedType.hashCode(stringIndexes, fqNameIndexes)
+    }
+
+    if (hasAbbreviatedTypeId()) {
+        hashCode = 31 * hashCode + abbreviatedTypeId
+    }
+
     for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) {
         hashCode = 31 * hashCode + getExtension(JvmProtoBuf.typeAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
     }
@@ -1054,7 +1240,7 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I
     return hashCode
 }
 
-public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasFlags()) {
@@ -1072,19 +1258,17 @@ public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameInde
     return hashCode
 }
 
-public fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
-    hashCode = 31 * hashCode + fqNameIndexes(id)
-
-    for(i in 0..argumentCount - 1) {
-        hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes)
+    if (hasName()) {
+        hashCode = 31 * hashCode + stringIndexes(name)
     }
 
     return hashCode
 }
 
-public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasFlags()) {
@@ -1109,14 +1293,10 @@ public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameI
         hashCode = 31 * hashCode + varargElementTypeId
     }
 
-    if (hasExtension(JvmProtoBuf.index)) {
-        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.index)
-    }
-
     return hashCode
 }
 
-public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasName()) {
@@ -1130,7 +1310,7 @@ public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int,
     return hashCode
 }
 
-public fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasField()) {
@@ -1152,7 +1332,19 @@ public fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int
     return hashCode
 }
 
-public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+    var hashCode = 1
+
+    hashCode = 31 * hashCode + fqNameIndexes(id)
+
+    for(i in 0..argumentCount - 1) {
+        hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes)
+    }
+
+    return hashCode
+}
+
+fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasProjection()) {
@@ -1170,17 +1362,7 @@ public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIn
     return hashCode
 }
 
-public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
-    var hashCode = 1
-
-    hashCode = 31 * hashCode + stringIndexes(nameId)
-
-    hashCode = 31 * hashCode + value.hashCode(stringIndexes, fqNameIndexes)
-
-    return hashCode
-}
-
-public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasName()) {
@@ -1191,14 +1373,20 @@ public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, f
         hashCode = 31 * hashCode + stringIndexes(desc)
     }
 
-    if (hasIsStaticInOuter()) {
-        hashCode = 31 * hashCode + isStaticInOuter.hashCode()
-    }
+    return hashCode
+}
+
+fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+    var hashCode = 1
+
+    hashCode = 31 * hashCode + stringIndexes(nameId)
+
+    hashCode = 31 * hashCode + value.hashCode(stringIndexes, fqNameIndexes)
 
     return hashCode
 }
 
-public fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
     if (hasType()) {

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

@@ -0,0 +1,284 @@
+/*
+ * 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.
+ * 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.
+ */
+
+// these functions are used in the kotlin gradle plugin
+@file:Suppress("unused")
+
+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
+import org.jetbrains.kotlin.build.GeneratedJvmClass
+import org.jetbrains.kotlin.build.JvmSourceRoot
+import org.jetbrains.kotlin.build.isModuleMappingFile
+import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
+import org.jetbrains.kotlin.config.IncrementalCompilation
+import org.jetbrains.kotlin.config.Services
+import org.jetbrains.kotlin.incremental.components.LookupTracker
+import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
+import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
+import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder
+import org.jetbrains.kotlin.modules.TargetId
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.progress.CompilationCanceledStatus
+import org.jetbrains.kotlin.utils.keysToMap
+import java.io.File
+import java.util.*
+
+
+fun Iterable<File>.javaSourceRoots(roots: Iterable<File>): Iterable<File> =
+        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()
+    builder.addModule(
+            name,
+            outputDir.absolutePath,
+            sourcesToCompile,
+            javaSourceRoots.map { JvmSourceRoot(it) },
+            classpath,
+            "java-production",
+            isTest,
+            // this excludes the output directories from the class path, to be removed for true incremental compilation
+            setOf(outputDir),
+            friendDirs
+    )
+
+    val scriptFile = File.createTempFile("kjps", StringUtil.sanitizeJavaIdentifier(name) + ".script.xml")
+    FileUtil.writeToFile(scriptFile, builder.asText().toString())
+    return scriptFile
+}
+
+fun makeCompileServices(
+        incrementalCaches: Map<TargetId, IncrementalCache>,
+        lookupTracker: LookupTracker,
+        compilationCanceledStatus: CompilationCanceledStatus?
+): Services =
+    with(Services.Builder()) {
+        register(IncrementalCompilationComponents::class.java, IncrementalCompilationComponentsImpl(incrementalCaches, lookupTracker))
+        compilationCanceledStatus?.let {
+            register(CompilationCanceledStatus::class.java, it)
+        }
+        build()
+    }
+
+fun makeLookupTracker(parentLookupTracker: LookupTracker = LookupTracker.DO_NOTHING): LookupTracker =
+        if (IncrementalCompilation.isExperimental()) LookupTrackerImpl(parentLookupTracker)
+        else parentLookupTracker
+
+fun<Target> makeIncrementalCachesMap(
+        targets: Iterable<Target>,
+        getDependencies: (Target) -> Iterable<Target>,
+        getCache: (Target) -> IncrementalCacheImpl<Target>,
+        getTargetId: Target.() -> TargetId
+): Map<TargetId, IncrementalCacheImpl<Target>>
+{
+    val dependents = targets.keysToMap { hashSetOf<Target>() }
+    val targetsWithDependents = targets.toHashSet()
+
+    for (target in targets) {
+        for (dependency in getDependencies(target)) {
+            if (dependency !in targets) continue
+
+            dependents[dependency]!!.add(target)
+            targetsWithDependents.add(target)
+        }
+    }
+
+    val caches = targetsWithDependents.keysToMap { getCache(it) }
+
+    for ((target, cache) in caches) {
+        dependents[target]?.forEach {
+            cache.addDependentCache(caches[it]!!)
+        }
+    }
+
+    return caches.mapKeys { it.key.getTargetId() }
+}
+
+fun<Target> updateIncrementalCaches(
+        targets: Iterable<Target>,
+        generatedFiles: List<GeneratedFile<Target>>,
+        compiledWithErrors: Boolean,
+        getIncrementalCache: (Target) -> IncrementalCacheImpl<Target>
+): CompilationResult {
+
+    var changesInfo = CompilationResult.NO_CHANGES
+    for (generatedFile in generatedFiles) {
+        val ic = getIncrementalCache(generatedFile.target)
+        when {
+            generatedFile is GeneratedJvmClass<Target> -> changesInfo += ic.saveFileToCache(generatedFile)
+            generatedFile.outputFile.isModuleMappingFile() -> changesInfo += ic.saveModuleMappingToCache(generatedFile.sourceFiles, generatedFile.outputFile)
+        }
+    }
+
+    if (!compiledWithErrors) {
+        targets.forEach {
+            val newChangesInfo = getIncrementalCache(it).clearCacheForRemovedClasses()
+            changesInfo += newChangesInfo
+        }
+    }
+
+    return changesInfo
+}
+
+fun LookupStorage.update(
+        lookupTracker: LookupTracker,
+        filesToCompile: Iterable<File>,
+        removedFiles: Iterable<File>
+) {
+    if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker.javaClass}")
+
+    removeLookupsFrom(filesToCompile.asSequence() + removedFiles.asSequence())
+
+    addAll(lookupTracker.lookups.entrySet(), lookupTracker.pathInterner.values)
+}
+
+fun<Target> OutputItemsCollectorImpl.generatedFiles(
+        targets: Collection<Target>,
+        representativeTarget: Target,
+        getSources: (Target) -> Iterable<File>,
+        getOutputDir: (Target) -> File?
+): List<GeneratedFile<Target>> {
+    // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below
+    val sourceToTarget =
+            if (targets.size >1) targets.flatMap { target -> getSources(target).map { Pair(it, target) } }.toMap()
+            else mapOf<File, Target>()
+
+    return outputs.map { outputItem ->
+        val target =
+                outputItem.sourceFiles.firstOrNull()?.let { sourceToTarget[it] } ?:
+                targets.filter { getOutputDir(it)?.let { outputItem.outputFile.startsWith(it) } ?: false }.singleOrNull() ?:
+                representativeTarget
+        if (outputItem.outputFile.name.endsWith(".class"))
+            GeneratedJvmClass(target, outputItem.sourceFiles, outputItem.outputFile)
+        else
+            GeneratedFile(target, outputItem.sourceFiles, outputItem.outputFile)
+    }
+}
+
+data class DirtyData(
+        val dirtyLookupSymbols: Iterable<LookupSymbol>,
+        val dirtyClassesFqNames: Iterable<FqName>
+)
+
+fun <Target> CompilationResult.getDirtyData(
+        caches: Iterable<IncrementalCacheImpl<Target>>,
+        log: (String)->Unit
+): DirtyData {
+    val dirtyLookupSymbols = HashSet<LookupSymbol>()
+    val dirtyClassesFqNames = HashSet<FqName>()
+
+    for (change in changes) {
+        log("Process $change")
+
+        if (change is ChangeInfo.SignatureChanged) {
+            val fqNames = if (!change.areSubclassesAffected) listOf(change.fqName) else withSubtypes(change.fqName, caches)
+
+            for (classFqName in fqNames) {
+                assert(!classFqName.isRoot) { "$classFqName is root when processing $change" }
+
+                val scope = classFqName.parent().asString()
+                val name = classFqName.shortName().identifier
+                dirtyLookupSymbols.add(LookupSymbol(name, scope))
+            }
+        }
+        else if (change is ChangeInfo.MembersChanged) {
+            val fqNames = withSubtypes(change.fqName, caches)
+            // need to recompile subtypes because changed member might break override
+            dirtyClassesFqNames.addAll(fqNames)
+
+            for (name in change.names) {
+                for (fqName in fqNames) {
+                    dirtyLookupSymbols.add(LookupSymbol(name, fqName.asString()))
+                }
+            }
+        }
+    }
+
+    return DirtyData(dirtyLookupSymbols, dirtyClassesFqNames)
+}
+
+fun mapLookupSymbolsToFiles(
+        lookupStorage: LookupStorage,
+        lookupSymbols: Iterable<LookupSymbol>,
+        log: (String)->Unit,
+        getLogFilePath: (File)->String = { it.canonicalPath },
+        excludes: Set<File> = emptySet()
+): Set<File> {
+    val dirtyFiles = HashSet<File>()
+
+    for (lookup in lookupSymbols) {
+        val affectedFiles = lookupStorage.get(lookup).map(::File).filter { it !in excludes }
+        log("${lookup.scope}#${lookup.name} caused recompilation of: ${affectedFiles.map(getLogFilePath)}")
+        dirtyFiles.addAll(affectedFiles)
+    }
+
+    return dirtyFiles
+}
+
+fun <Target> mapClassesFqNamesToFiles(
+        caches: Iterable<IncrementalCacheImpl<Target>>,
+        classesFqNames: Iterable<FqName>,
+        log: (String)->Unit,
+        getLogFilePath: (File)->String = { it.canonicalPath },
+        excludes: Set<File> = emptySet()
+): Set<File> {
+    val dirtyFiles = HashSet<File>()
+
+    for (cache in caches) {
+        for (dirtyClassFqName in classesFqNames) {
+            val srcFile = cache.getSourceFileIfClass(dirtyClassFqName)
+            if (srcFile == null || srcFile in excludes) continue
+
+            log("Class $dirtyClassFqName caused recompilation of: ${getLogFilePath(srcFile)}")
+            dirtyFiles.add(srcFile)
+        }
+    }
+
+    return dirtyFiles
+}
+
+private fun File.isJavaFile() = extension.equals(JavaFileType.INSTANCE.defaultExtension, ignoreCase = true)
+
+private fun findSrcDirRoot(file: File, roots: Iterable<File>): File? =
+        roots.firstOrNull { FileUtil.isAncestor(it, file, false) }
+
+private fun <Target> withSubtypes(
+        typeFqName: FqName,
+        caches: Iterable<IncrementalCacheImpl<Target>>
+): Set<FqName> {
+    val types = LinkedList(listOf(typeFqName))
+    val subtypes = hashSetOf<FqName>()
+
+    while (types.isNotEmpty()) {
+        val unprocessedType = types.pollFirst()
+
+        caches.asSequence()
+              .flatMap { it.getSubtypesOf(unprocessedType) }
+              .filter { it !in subtypes }
+              .forEach { types.addLast(it) }
+
+        subtypes.add(unprocessedType)
+    }
+
+    return subtypes
+}
+

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

@@ -0,0 +1,282 @@
+/*
+ * 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.
+ * 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.incremental
+
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.incremental.ProtoCompareGenerated.ProtoBufClassKind
+import org.jetbrains.kotlin.incremental.ProtoCompareGenerated.ProtoBufPackageKind
+import org.jetbrains.kotlin.incremental.storage.ProtoMapValue
+import org.jetbrains.kotlin.protobuf.MessageLite
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.Deserialization
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
+import java.util.*
+
+data class Difference(
+        val isClassAffected: Boolean = false,
+        val areSubclassesAffected: Boolean = false,
+        val changedMembersNames: Set<String> = emptySet()
+)
+
+fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): Difference {
+    if (!oldData.isPackageFacade && newData.isPackageFacade) return Difference(isClassAffected = true, areSubclassesAffected = true)
+
+    if (oldData.isPackageFacade && !newData.isPackageFacade) return Difference(isClassAffected = true)
+
+    val differenceObject =
+            if (oldData.isPackageFacade) {
+                DifferenceCalculatorForPackageFacade(oldData, newData)
+            }
+            else {
+                DifferenceCalculatorForClass(oldData, newData)
+            }
+
+    return differenceObject.difference()
+}
+
+internal val MessageLite.isPrivate: Boolean
+    get() = Visibilities.isPrivate(Deserialization.visibility(
+            when (this) {
+                is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags)
+                is ProtoBuf.Function -> Flags.VISIBILITY.get(flags)
+                is ProtoBuf.Property -> Flags.VISIBILITY.get(flags)
+                is ProtoBuf.TypeAlias -> Flags.VISIBILITY.get(flags)
+                else -> error("Unknown message: $this")
+            }))
+
+private fun MessageLite.name(nameResolver: NameResolver): String {
+    return when (this) {
+        is ProtoBuf.Constructor -> "<init>"
+        is ProtoBuf.Function -> nameResolver.getString(name)
+        is ProtoBuf.Property -> nameResolver.getString(name)
+        is ProtoBuf.TypeAlias -> nameResolver.getString(name)
+        else -> error("Unknown message: $this")
+    }
+}
+
+internal fun List<MessageLite>.names(nameResolver: NameResolver): List<String> = map { it.name(nameResolver) }
+
+private abstract class DifferenceCalculator() {
+    protected abstract val oldNameResolver: NameResolver
+    protected abstract val newNameResolver: NameResolver
+
+    protected val compareObject by lazy { ProtoCompareGenerated(oldNameResolver, newNameResolver) }
+
+    abstract fun difference(): Difference
+
+    protected fun calcDifferenceForMembers(oldList: List<MessageLite>, newList: List<MessageLite>): Collection<String> {
+        val result = hashSetOf<String>()
+
+        val oldMap =
+                oldList.groupBy { it.getHashCode({ compareObject.oldGetIndexOfString(it) }, { compareObject.oldGetIndexOfClassId(it) }) }
+        val newMap =
+                newList.groupBy { it.getHashCode({ compareObject.newGetIndexOfString(it) }, { compareObject.newGetIndexOfClassId(it) }) }
+
+        val hashes = oldMap.keys + newMap.keys
+        for (hash in hashes) {
+            val oldMembers = oldMap[hash]
+            val newMembers = newMap[hash]
+
+            val differentMembers = when {
+                newMembers == null -> oldMembers!!.names(compareObject.oldNameResolver)
+                oldMembers == null -> newMembers.names(compareObject.newNameResolver)
+                else -> calcDifferenceForEqualHashes(oldMembers, newMembers)
+            }
+            result.addAll(differentMembers)
+        }
+
+        return result
+    }
+
+    private fun calcDifferenceForEqualHashes(
+            oldList: List<MessageLite>,
+            newList: List<MessageLite>
+    ): Collection<String> {
+        val result = hashSetOf<String>()
+        val newSet = HashSet(newList)
+
+        oldList.forEach { oldMember ->
+            val newMember = newSet.firstOrNull { compareObject.checkEquals(oldMember, it) }
+            if (newMember != null) {
+                newSet.remove(newMember)
+            }
+            else {
+                result.add(oldMember.name(compareObject.oldNameResolver))
+            }
+        }
+
+        newSet.forEach { newMember ->
+            result.add(newMember.name(compareObject.newNameResolver))
+        }
+
+        return result
+    }
+
+    protected fun calcDifferenceForNames(
+            oldList: List<Int>,
+            newList: List<Int>
+    ): Collection<String> {
+        val oldNames = oldList.map { compareObject.oldNameResolver.getString(it) }.toSet()
+        val newNames = newList.map { compareObject.newNameResolver.getString(it) }.toSet()
+        return oldNames.union(newNames) - oldNames.intersect(newNames)
+    }
+
+    private fun MessageLite.getHashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+        return when (this) {
+            is ProtoBuf.Constructor -> hashCode(stringIndexes, fqNameIndexes)
+            is ProtoBuf.Function -> hashCode(stringIndexes, fqNameIndexes)
+            is ProtoBuf.Property -> hashCode(stringIndexes, fqNameIndexes)
+            is ProtoBuf.TypeAlias -> hashCode(stringIndexes, fqNameIndexes)
+            else -> error("Unknown message: $this")
+        }
+    }
+
+    private fun ProtoCompareGenerated.checkEquals(old: MessageLite, new: MessageLite): Boolean {
+        return when {
+            old is ProtoBuf.Constructor && new is ProtoBuf.Constructor -> checkEquals(old, new)
+            old is ProtoBuf.Function && new is ProtoBuf.Function -> checkEquals(old, new)
+            old is ProtoBuf.Property && new is ProtoBuf.Property -> checkEquals(old, new)
+            old is ProtoBuf.TypeAlias && new is ProtoBuf.TypeAlias -> checkEquals(old, new)
+            else -> error("Unknown message: $this")
+        }
+    }
+}
+
+private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() {
+    val oldClassData = JvmProtoBufUtil.readClassDataFrom(oldData.bytes, oldData.strings)
+    val newClassData = JvmProtoBufUtil.readClassDataFrom(newData.bytes, newData.strings)
+
+    val oldProto = oldClassData.classProto
+    val newProto = newClassData.classProto
+
+    override val oldNameResolver = oldClassData.nameResolver
+    override val newNameResolver = newClassData.nameResolver
+
+    val diff = compareObject.difference(oldProto, newProto)
+
+    override fun difference(): Difference {
+        var isClassAffected = false
+        var areSubclassesAffected = false
+        val names = hashSetOf<String>()
+        val classIsSealed = newProto.isSealed && oldProto.isSealed
+
+        fun Int.oldToNames() = names.add(oldNameResolver.getString(this))
+        fun Int.newToNames() = names.add(newNameResolver.getString(this))
+
+        fun calcDifferenceForNonPrivateMembers(members: (ProtoBuf.Class) -> List<MessageLite>): Collection<String> {
+            val oldMembers = members(oldProto).filterNot { it.isPrivate }
+            val newMembers = members(newProto).filterNot { it.isPrivate }
+            return calcDifferenceForMembers(oldMembers, newMembers)
+        }
+
+        for (kind in diff) {
+            when (kind!!) {
+                ProtoBufClassKind.COMPANION_OBJECT_NAME -> {
+                    if (oldProto.hasCompanionObjectName()) oldProto.companionObjectName.oldToNames()
+                    if (newProto.hasCompanionObjectName()) newProto.companionObjectName.newToNames()
+                }
+                ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> {
+                    if (classIsSealed) {
+                        // when class is sealed, adding an implementation can break exhaustive when expressions
+                        // the workaround is to recompile all class usages
+                        isClassAffected = true
+                    }
+
+                    names.addAll(calcDifferenceForNames(oldProto.nestedClassNameList, newProto.nestedClassNameList))
+                }
+                ProtoBufClassKind.CONSTRUCTOR_LIST -> {
+                    val differentNonPrivateConstructors = calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getConstructorList)
+
+                    if (differentNonPrivateConstructors.isNotEmpty()) {
+                        isClassAffected = true
+                    }
+                }
+                ProtoBufClassKind.FUNCTION_LIST ->
+                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList))
+                ProtoBufClassKind.PROPERTY_LIST ->
+                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList))
+                ProtoBufClassKind.TYPE_ALIAS_LIST ->
+                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getTypeAliasList))
+                ProtoBufClassKind.ENUM_ENTRY_LIST -> {
+                    isClassAffected = true
+                }
+                ProtoBufClassKind.TYPE_TABLE -> {
+                    // TODO
+                }
+                ProtoBufClassKind.FLAGS,
+                ProtoBufClassKind.FQ_NAME,
+                ProtoBufClassKind.TYPE_PARAMETER_LIST,
+                ProtoBufClassKind.SUPERTYPE_LIST,
+                ProtoBufClassKind.SUPERTYPE_ID_LIST-> {
+                    isClassAffected = true
+                    areSubclassesAffected = true
+                }
+                ProtoBufClassKind.CLASS_MODULE_NAME -> {
+                    // TODO
+                }
+            }
+        }
+
+        return Difference(isClassAffected, areSubclassesAffected, names)
+    }
+}
+
+private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() {
+    val oldPackageData = JvmProtoBufUtil.readPackageDataFrom(oldData.bytes, oldData.strings)
+    val newPackageData = JvmProtoBufUtil.readPackageDataFrom(newData.bytes, newData.strings)
+
+    val oldProto = oldPackageData.packageProto
+    val newProto = newPackageData.packageProto
+
+    override val oldNameResolver = oldPackageData.nameResolver
+    override val newNameResolver = newPackageData.nameResolver
+
+    val diff = compareObject.difference(oldProto, newProto)
+
+    override fun difference(): Difference {
+        val names = hashSetOf<String>()
+
+        fun calcDifferenceForNonPrivateMembers(members: (ProtoBuf.Package) -> List<MessageLite>): Collection<String> {
+            val oldMembers = members(oldProto).filterNot { it.isPrivate }
+            val newMembers = members(newProto).filterNot { it.isPrivate }
+            return calcDifferenceForMembers(oldMembers, newMembers)
+        }
+
+        for (kind in diff) {
+            when (kind!!) {
+                ProtoBufPackageKind.FUNCTION_LIST ->
+                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getFunctionList))
+                ProtoBufPackageKind.PROPERTY_LIST ->
+                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getPropertyList))
+                ProtoBufPackageKind.TYPE_ALIAS_LIST ->
+                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getTypeAliasList))
+                ProtoBufPackageKind.TYPE_TABLE,
+                ProtoBufPackageKind.PACKAGE_MODULE_NAME -> {
+                    // TODO
+                }
+                else -> throw IllegalArgumentException("Unsupported kind: $kind")
+            }
+        }
+
+        return Difference(changedMembersNames = names)
+    }
+}
+
+private val ProtoBuf.Class.isSealed: Boolean
+    get() = ProtoBuf.Modality.SEALED == Flags.MODALITY.get(flags)

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.jps.incremental.storage
+package org.jetbrains.kotlin.incremental.storage
 
 import com.intellij.util.io.DataExternalizer
 import com.intellij.util.io.EnumeratorStringDescriptor
@@ -23,14 +23,14 @@ import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.utils.Printer
 import java.io.File
 
-internal abstract class BasicMap<K : Comparable<K>, V>(
+abstract class BasicMap<K : Comparable<K>, V>(
         storageFile: File,
         keyDescriptor: KeyDescriptor<K>,
         valueExternalizer: DataExternalizer<V>
 ) {
     protected val storage = LazyStorage(storageFile, keyDescriptor, valueExternalizer)
 
-    open fun clean() {
+    fun clean() {
         storage.clean()
     }
 
@@ -60,19 +60,22 @@ internal abstract class BasicMap<K : Comparable<K>, V>(
         }.toString()
     }
 
+    @TestOnly
     protected abstract fun dumpKey(key: K): String
+
+    @TestOnly
     protected abstract fun dumpValue(value: V): String
 }
 
-internal abstract class BasicStringMap<V>(
+abstract class BasicStringMap<V>(
         storageFile: File,
         keyDescriptor: KeyDescriptor<String>,
         valueExternalizer: DataExternalizer<V>
 ) : BasicMap<String, V>(storageFile, keyDescriptor, valueExternalizer) {
-    public constructor(
+    constructor(
             storageFile: File,
             valueExternalizer: DataExternalizer<V>
     ) : this(storageFile, EnumeratorStringDescriptor.INSTANCE, valueExternalizer)
 
     override fun dumpKey(key: String): String = key
-}
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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.incremental.storage
+
+import org.jetbrains.annotations.TestOnly
+
+open class BasicMapsOwner {
+    private val maps = arrayListOf<BasicMap<*, *>>()
+
+    companion object {
+        val CACHE_EXTENSION = "tab"
+    }
+
+    protected fun <K, V, M : BasicMap<K, V>> registerMap(map: M): M {
+        maps.add(map)
+        return map
+    }
+
+    open fun clean() {
+        maps.forEach { it.clean() }
+    }
+
+    open fun close() {
+        maps.forEach { it.close() }
+    }
+
+    open fun flush(memoryCachesOnly: Boolean) {
+        maps.forEach { it.flush(memoryCachesOnly) }
+    }
+
+    @TestOnly fun dump(): String = maps.map { it.dump() }.joinToString("\n\n")
+}

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

@@ -0,0 +1,55 @@
+/*
+ * 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.incremental.storage
+
+import org.jetbrains.kotlin.incremental.dumpCollection
+import org.jetbrains.kotlin.name.FqName
+import java.io.File
+
+internal open class ClassOneToManyMap(
+        storageFile: File
+) : BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) {
+    override fun dumpValue(value: Collection<String>): String = value.dumpCollection()
+
+    fun add(key: FqName, value: FqName) {
+        storage.append(key.asString(), value.asString())
+    }
+
+    operator fun get(key: FqName): Collection<FqName> =
+            storage[key.asString()]?.map(::FqName) ?: setOf()
+
+    operator fun set(key: FqName, values: Collection<FqName>) {
+        if (values.isEmpty()) {
+            remove(key)
+            return
+        }
+
+        storage[key.asString()] = values.map(FqName::asString)
+    }
+
+    fun remove(key: FqName) {
+        storage.remove(key.asString())
+    }
+
+    fun removeValues(key: FqName, removed: Set<FqName>) {
+        val notRemoved = this[key].filter { it !in removed }
+        this[key] = notRemoved
+    }
+}
+
+internal class SubtypesMap(storageFile: File) : ClassOneToManyMap(storageFile)
+internal class SupertypesMap(storageFile: File) : ClassOneToManyMap(storageFile)

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

@@ -0,0 +1,38 @@
+/*
+ * 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.incremental.storage
+
+import org.jetbrains.kotlin.utils.keysToMap
+import java.io.File
+
+internal class FileToIdMap(file: File) : BasicMap<File, Int>(file, FileKeyDescriptor, IntExternalizer) {
+    override fun dumpKey(key: File): String = key.toString()
+
+    override fun dumpValue(value: Int): String = value.toString()
+
+    operator fun get(file: File): Int? = storage[file]
+
+    operator fun set(file: File, id: Int) {
+        storage[file] = id
+    }
+
+    fun remove(file: File) {
+        storage.remove(file)
+    }
+
+    fun toMap(): Map<File, Int> = storage.keys.keysToMap { storage[it]!! }
+}

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

@@ -0,0 +1,38 @@
+/*
+ * 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.incremental.storage
+
+import com.intellij.util.io.ExternalIntegerKeyDescriptor
+import java.io.File
+
+internal class IdToFileMap(file: File) : BasicMap<Int, File>(file, ExternalIntegerKeyDescriptor(), FileKeyDescriptor) {
+    override fun dumpKey(key: Int): String = key.toString()
+
+    override fun dumpValue(value: File): String = value.toString()
+
+    operator fun get(id: Int): File? = storage[id]
+
+    operator fun contains(id: Int): Boolean = id in storage
+
+    operator fun set(id: Int, file: File) {
+        storage[id] = file
+    }
+
+    fun remove(id: Int) {
+        storage.remove(id)
+    }
+}

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

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.jps.incremental.storage
+package org.jetbrains.kotlin.incremental.storage
 
 import com.intellij.util.io.DataExternalizer
+import com.intellij.util.io.IOUtil
 import com.intellij.util.io.KeyDescriptor
 import com.intellij.util.io.PersistentHashMap
 import java.io.DataOutput
@@ -27,7 +28,7 @@ import java.io.IOException
 /**
  * It's lazy in a sense that PersistentHashMap is created only on write
  */
-internal class LazyStorage<K, V>(
+class LazyStorage<K, V>(
         private val storageFile: File,
         private val keyDescriptor: KeyDescriptor<K>,
         private val valueExternalizer: DataExternalizer<V>
@@ -73,8 +74,12 @@ internal class LazyStorage<K, V>(
         getStorageIfExists()?.remove(key)
     }
 
-    fun append(key: K, append: (DataOutput)->Unit) {
-        getStorageOrCreateNew().appendData(key, append)
+    fun append(key: K, value: String) {
+        append(key) { out -> IOUtil.writeUTF(out, value) }
+    }
+
+    fun append(key: K, value: Int) {
+        append(key) { out -> out.writeInt(value) }
     }
 
     @Synchronized
@@ -110,4 +115,8 @@ internal class LazyStorage<K, V>(
 
     private fun createMap(): PersistentHashMap<K, V> =
             PersistentHashMap(storageFile, keyDescriptor, valueExternalizer)
+
+    private fun append(key: K, append: (DataOutput)->Unit) {
+        getStorageOrCreateNew().appendData(key, append)
+    }
 }

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

@@ -0,0 +1,42 @@
+/*
+ * 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.incremental.storage
+
+import java.io.File
+
+internal class LookupMap(storage: File) : BasicMap<LookupSymbolKey, Collection<Int>>(storage, LookupSymbolKeyDescriptor, IntCollectionExternalizer) {
+    override fun dumpKey(key: LookupSymbolKey): String = key.toString()
+
+    override fun dumpValue(value: Collection<Int>): String = value.toString()
+
+    fun add(name: String, scope: String, fileId: Int) {
+        storage.append(LookupSymbolKey(name, scope), fileId)
+    }
+
+    operator fun get(key: LookupSymbolKey): Collection<Int>? = storage[key]
+
+    operator fun set(key: LookupSymbolKey, fileIds: Set<Int>) {
+        storage[key] = fileIds
+    }
+
+    fun remove(key: LookupSymbolKey) {
+        storage.remove(key)
+    }
+
+    val keys: Collection<LookupSymbolKey>
+        get() = storage.keys
+}

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

@@ -0,0 +1,216 @@
+/*
+ * 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.incremental.storage
+
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.util.io.DataExternalizer
+import com.intellij.util.io.EnumeratorStringDescriptor
+import com.intellij.util.io.IOUtil
+import com.intellij.util.io.KeyDescriptor
+import java.io.DataInput
+import java.io.DataInputStream
+import java.io.DataOutput
+import java.io.File
+import java.util.*
+
+object LookupSymbolKeyDescriptor : KeyDescriptor<LookupSymbolKey> {
+    override fun read(input: DataInput): LookupSymbolKey {
+        val first = input.readInt()
+        val second = input.readInt()
+
+        return LookupSymbolKey(first, second)
+    }
+
+    override fun save(output: DataOutput, value: LookupSymbolKey) {
+        output.writeInt(value.nameHash)
+        output.writeInt(value.scopeHash)
+    }
+
+    override fun getHashCode(value: LookupSymbolKey): Int = value.hashCode()
+
+    override fun isEqual(val1: LookupSymbolKey, val2: LookupSymbolKey): Boolean = val1 == val2
+}
+
+object ProtoMapValueExternalizer : DataExternalizer<ProtoMapValue> {
+    override fun save(output: DataOutput, value: ProtoMapValue) {
+        output.writeBoolean(value.isPackageFacade)
+        output.writeInt(value.bytes.size)
+        output.write(value.bytes)
+        output.writeInt(value.strings.size)
+
+        for (string in value.strings) {
+            output.writeUTF(string)
+        }
+    }
+
+    override fun read(input: DataInput): ProtoMapValue {
+        val isPackageFacade = input.readBoolean()
+        val bytesLength = input.readInt()
+        val bytes = ByteArray(bytesLength)
+        input.readFully(bytes, 0, bytesLength)
+        val stringsLength = input.readInt()
+        val strings = Array<String>(stringsLength) { input.readUTF() }
+        return ProtoMapValue(isPackageFacade, bytes, strings)
+    }
+}
+
+
+abstract class StringMapExternalizer<T> : DataExternalizer<Map<String, T>> {
+    override fun save(output: DataOutput, map: Map<String, T>?) {
+        output.writeInt(map!!.size)
+
+        for ((key, value) in map.entries) {
+            IOUtil.writeString(key, output)
+            writeValue(output, value)
+        }
+    }
+
+    override fun read(input: DataInput): Map<String, T>? {
+        val size = input.readInt()
+        val map = HashMap<String, T>(size)
+
+        repeat(size) {
+            val name = IOUtil.readString(input)!!
+            map[name] = readValue(input)
+        }
+
+        return map
+    }
+
+    protected abstract fun writeValue(output: DataOutput, value: T)
+    protected abstract fun readValue(input: DataInput): T
+}
+
+
+object StringToLongMapExternalizer : StringMapExternalizer<Long>() {
+    override fun readValue(input: DataInput): Long = input.readLong()
+
+    override fun writeValue(output: DataOutput, value: Long) {
+        output.writeLong(value)
+    }
+}
+
+object ConstantsMapExternalizer : DataExternalizer<Map<String, Any>> {
+    override fun save(output: DataOutput, map: Map<String, Any>?) {
+        output.writeInt(map!!.size)
+        for (name in map.keys.sorted()) {
+            IOUtil.writeString(name, output)
+            val value = map[name]!!
+            when (value) {
+                is Int -> {
+                    output.writeByte(Kind.INT.ordinal)
+                    output.writeInt(value)
+                }
+                is Float -> {
+                    output.writeByte(Kind.FLOAT.ordinal)
+                    output.writeFloat(value)
+                }
+                is Long -> {
+                    output.writeByte(Kind.LONG.ordinal)
+                    output.writeLong(value)
+                }
+                is Double -> {
+                    output.writeByte(Kind.DOUBLE.ordinal)
+                    output.writeDouble(value)
+                }
+                is String -> {
+                    output.writeByte(Kind.STRING.ordinal)
+                    IOUtil.writeString(value, output)
+                }
+                else -> throw IllegalStateException("Unexpected constant class: ${value.javaClass}")
+            }
+        }
+    }
+
+    override fun read(input: DataInput): Map<String, Any>? {
+        val size = input.readInt()
+        val map = HashMap<String, Any>(size)
+
+        repeat(size) {
+            val name = IOUtil.readString(input)!!
+            val kind = Kind.values()[input.readByte().toInt()]
+
+            val value: Any = when (kind) {
+                Kind.INT -> input.readInt()
+                Kind.FLOAT -> input.readFloat()
+                Kind.LONG -> input.readLong()
+                Kind.DOUBLE -> input.readDouble()
+                Kind.STRING -> IOUtil.readString(input)!!
+            }
+
+            map[name] = value
+        }
+
+        return map
+    }
+
+    private enum class Kind {
+        INT, FLOAT, LONG, DOUBLE, STRING
+    }
+}
+
+object IntExternalizer : DataExternalizer<Int> {
+    override fun read(input: DataInput): Int = input.readInt()
+
+    override fun save(output: DataOutput, value: Int) {
+        output.writeInt(value)
+    }
+}
+
+object PathStringDescriptor : EnumeratorStringDescriptor() {
+    override fun getHashCode(value: String) = FileUtil.pathHashCode(value)
+
+    override fun isEqual(val1: String, val2: String?) = FileUtil.pathsEqual(val1, val2)
+}
+
+object FileKeyDescriptor : KeyDescriptor<File> {
+    override fun read(input: DataInput): File = File(input.readUTF())
+
+    override fun save(output: DataOutput, value: File) {
+        output.writeUTF(value.canonicalPath)
+    }
+
+    override fun getHashCode(value: File?): Int =
+            FileUtil.FILE_HASHING_STRATEGY.computeHashCode(value)
+
+    override fun isEqual(val1: File?, val2: File?): Boolean =
+            FileUtil.FILE_HASHING_STRATEGY.equals(val1, val2)
+}
+
+open class CollectionExternalizer<T>(
+        private val elementExternalizer: DataExternalizer<T>,
+        private val newCollection: () -> MutableCollection<T>
+) : DataExternalizer<Collection<T>> {
+    override fun read(input: DataInput): Collection<T> {
+        val result = newCollection()
+        val stream = input as DataInputStream
+
+        while (stream.available() > 0) {
+            result.add(elementExternalizer.read(stream))
+        }
+
+        return result
+    }
+
+    override fun save(output: DataOutput, value: Collection<T>) {
+        value.forEach { elementExternalizer.save(output, it) }
+    }
+}
+
+object StringCollectionExternalizer : CollectionExternalizer<String>(EnumeratorStringDescriptor(), { HashSet() })
+
+object IntCollectionExternalizer : CollectionExternalizer<Int>(IntExternalizer, { HashSet() })

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.incremental.storage
+
+data class LookupSymbolKey(val nameHash: Int, val scopeHash: Int) : Comparable<LookupSymbolKey> {
+    constructor(name: String, scope: String) : this(name.hashCode(), scope.hashCode())
+
+    override fun compareTo(other: LookupSymbolKey): Int {
+        val nameCmp = nameHash.compareTo(other.nameHash)
+
+        if (nameCmp != 0) return nameCmp
+
+        return scopeHash.compareTo(other.scopeHash)
+    }
+}
+
+data class ProtoMapValue(val isPackageFacade: Boolean, val bytes: ByteArray, val strings: Array<String>)

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

@@ -0,0 +1,131 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.modules
+
+import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName
+import com.intellij.openapi.util.text.StringUtil.escapeXml
+import org.jetbrains.kotlin.build.JvmSourceRoot
+import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.*
+import org.jetbrains.kotlin.config.IncrementalCompilation
+import org.jetbrains.kotlin.utils.Printer
+import java.io.File
+
+class KotlinModuleXmlBuilder {
+    private val xml = StringBuilder()
+    private val p = Printer(xml)
+    private var done = false
+
+    init {
+        openTag(p, MODULES)
+    }
+
+    fun addModule(
+            moduleName: String,
+            outputDir: String,
+            sourceFiles: Iterable<File>,
+            javaSourceRoots: Iterable<JvmSourceRoot>,
+            classpathRoots: Iterable<File>,
+            targetTypeId: String,
+            isTests: Boolean,
+            directoriesToFilterOut: Set<File>,
+            friendDirs: Iterable<File>): KotlinModuleXmlBuilder {
+        assert(!done) { "Already done" }
+
+        p.println("<!-- Module script for ${if (isTests) "tests" else "production"} -->")
+
+        p.println("<", MODULE, " ",
+                  NAME, "=\"", escapeXml(moduleName), "\" ",
+                  TYPE, "=\"", escapeXml(targetTypeId), "\" ",
+                  OUTPUT_DIR, "=\"", getEscapedPath(File(outputDir)), "\">")
+        p.pushIndent()
+
+        for (friendDir in friendDirs) {
+            p.println("<", FRIEND_DIR, " ", PATH, "=\"", getEscapedPath(friendDir), "\"/>")
+        }
+
+        for (sourceFile in sourceFiles) {
+            p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>")
+        }
+
+        processJavaSourceRoots(javaSourceRoots)
+        processClasspath(classpathRoots, directoriesToFilterOut)
+
+        closeTag(p, MODULE)
+        return this
+    }
+
+    private fun processClasspath(
+            files: Iterable<File>,
+            directoriesToFilterOut: Set<File>) {
+        p.println("<!-- Classpath -->")
+        for (file in files) {
+            val isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.isEnabled()
+            if (isOutput) {
+                // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies
+                // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was
+                // removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath.
+                p.println("<!-- Output directory, commented out -->")
+                p.println("<!-- ")
+                p.pushIndent()
+            }
+
+            p.println("<", CLASSPATH, " ", PATH, "=\"", getEscapedPath(file), "\"/>")
+
+            if (isOutput) {
+                p.popIndent()
+                p.println("-->")
+            }
+        }
+    }
+
+    private fun processJavaSourceRoots(roots: Iterable<JvmSourceRoot>) {
+        p.println("<!-- Java source roots -->")
+        for (root in roots) {
+            p.print("<")
+            p.printWithNoIndent(JAVA_SOURCE_ROOTS, " ", PATH, "=\"", getEscapedPath(root.file), "\"")
+
+            if (root.packagePrefix != null) {
+                p.printWithNoIndent(" ", JAVA_SOURCE_PACKAGE_PREFIX, "=\"", root.packagePrefix, "\"")
+            }
+
+            p.printWithNoIndent("/>")
+            p.println()
+        }
+    }
+
+    fun asText(): CharSequence {
+        if (!done) {
+            closeTag(p, MODULES)
+            done = true
+        }
+        return xml
+    }
+
+    private fun openTag(p: Printer, tag: String) {
+        p.println("<$tag>")
+        p.pushIndent()
+    }
+
+    private fun closeTag(p: Printer, tag: String) {
+        p.popIndent()
+        p.println("</$tag>")
+    }
+
+    private fun getEscapedPath(sourceFile: File): String {
+        return escapeXml(toSystemIndependentName(sourceFile.path))
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * 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.
+ * 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.incremental.testingUtils
+
+import java.io.File
+
+class BuildLogFinder(
+        private val isExperimentalEnabled: Boolean = false,
+        private val isDataContainerBuildLogEnabled: Boolean = false,
+        private val isGradleEnabled: Boolean = false
+) {
+    companion object {
+        private const val GRADLE_LOG = "gradle-build.log"
+        private const val DATA_CONTAINER_LOG = "data-container-version-build.log"
+        private const val EXPERIMENTAL_LOG = "experimental-ic-build.log"
+        private const val SIMPLE_LOG = "build.log"
+    }
+
+    fun findBuildLog(dir: File): File? {
+        val names = dir.list() ?: arrayOf()
+        val files = names.filter { File(dir, it).isFile }.toSet()
+        val matchedName = when {
+            isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG
+            isDataContainerBuildLogEnabled && DATA_CONTAINER_LOG in files -> DATA_CONTAINER_LOG
+            isExperimentalEnabled && EXPERIMENTAL_LOG in files -> EXPERIMENTAL_LOG
+            SIMPLE_LOG in files -> SIMPLE_LOG
+            else -> null
+        }
+
+        return File(dir, matchedName ?: return null)
+    }
+}
+

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

@@ -0,0 +1,181 @@
+/*
+ * 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.
+ * 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.incremental.testingUtils
+
+import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.incremental.LocalFileKotlinClass
+import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
+import org.jetbrains.kotlin.protobuf.ExtensionRegistry
+import org.jetbrains.kotlin.serialization.DebugProtoBuf
+import org.jetbrains.kotlin.serialization.jvm.BitEncoding
+import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf
+import org.jetbrains.kotlin.utils.Printer
+import org.jetbrains.org.objectweb.asm.ClassReader
+import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor
+import org.junit.Assert
+import org.junit.Assert.assertNotNull
+import java.io.ByteArrayInputStream
+import java.io.File
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.util.*
+import java.util.zip.CRC32
+import kotlin.comparisons.compareBy
+
+// Set this to true if you want to dump all bytecode (test will fail in this case)
+private val DUMP_ALL = System.getProperty("comparison.dump.all") == "true"
+
+fun assertEqualDirectories(expected: File, actual: File, forgiveExtraFiles: Boolean) {
+    val pathsInExpected = getAllRelativePaths(expected)
+    val pathsInActual = getAllRelativePaths(actual)
+
+    val commonPaths = pathsInExpected.intersect(pathsInActual)
+    val changedPaths = commonPaths
+            .filter { DUMP_ALL || !Arrays.equals(File(expected, it).readBytes(), File(actual, it).readBytes()) }
+            .sorted()
+
+    val expectedString = getDirectoryString(expected, changedPaths)
+    val actualString = getDirectoryString(actual, changedPaths)
+
+    if (DUMP_ALL) {
+        Assert.assertEquals(expectedString, actualString + " ")
+    }
+
+    if (forgiveExtraFiles) {
+        // If compilation fails, output may be different for full rebuild and partial make. Parsing output (directory string) for simplicity.
+        if (changedPaths.isEmpty()) {
+            val expectedListingLines = expectedString.split('\n').toList()
+            val actualListingLines = actualString.split('\n').toList()
+            if (actualListingLines.containsAll(expectedListingLines)) {
+                return
+            }
+        }
+    }
+
+    Assert.assertEquals(expectedString, actualString)
+}
+
+private fun File.checksumString(): String {
+    val crc32 = CRC32()
+    crc32.update(this.readBytes())
+    return java.lang.Long.toHexString(crc32.value)
+}
+
+private fun getDirectoryString(dir: File, interestingPaths: List<String>): String {
+    val buf = StringBuilder()
+    val p = Printer(buf)
+
+
+    fun addDirContent(dir: File) {
+        p.pushIndent()
+
+        val listFiles = dir.listFiles()
+        assertNotNull("$dir does not exist", listFiles)
+
+        val children = listFiles!!.sortedWith(compareBy({ it.isDirectory }, { it.name }))
+        for (child in children) {
+            if (child.isDirectory) {
+                if ((child.list()?.isNotEmpty() ?: false)) {
+                    p.println(child.name)
+                    addDirContent(child)
+                }
+            }
+            else {
+                p.println(child.name, " ", child.checksumString())
+            }
+        }
+
+        p.popIndent()
+    }
+
+
+    p.println(".")
+    addDirContent(dir)
+
+    for (path in interestingPaths) {
+        p.println("================", path, "================")
+        p.println(fileToStringRepresentation(File(dir, path)))
+        p.println()
+        p.println()
+    }
+
+    return buf.toString()
+}
+
+private fun getAllRelativePaths(dir: File): Set<String> {
+    val result = HashSet<String>()
+    FileUtil.processFilesRecursively(dir) {
+        if (it!!.isFile) {
+            result.add(FileUtil.getRelativePath(dir, it)!!)
+        }
+
+        true
+    }
+
+    return result
+}
+
+private fun classFileToString(classFile: File): String {
+    val out = StringWriter()
+
+    val traceVisitor = TraceClassVisitor(PrintWriter(out))
+    ClassReader(classFile.readBytes()).accept(traceVisitor, 0)
+
+    val classHeader = LocalFileKotlinClass.create(classFile)?.classHeader
+
+    val annotationDataEncoded = classHeader?.data
+    if (annotationDataEncoded != null) {
+        ByteArrayInputStream(BitEncoding.decodeBytes(annotationDataEncoded)).use {
+            input ->
+
+            out.write("\n------ string table types proto -----\n${DebugJvmProtoBuf.StringTableTypes.parseDelimitedFrom(input)}")
+
+            if (!classHeader!!.metadataVersion.isCompatible()) {
+                error("Incompatible class ($classHeader): $classFile")
+            }
+
+            when (classHeader.kind) {
+                KotlinClassHeader.Kind.FILE_FACADE ->
+                    out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}")
+                KotlinClassHeader.Kind.CLASS ->
+                    out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}")
+                KotlinClassHeader.Kind.MULTIFILE_CLASS_PART ->
+                    out.write("\n------ multi-file part proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}")
+                else -> throw IllegalStateException()
+            }
+        }
+    }
+
+    return out.toString()
+}
+
+private fun getExtensionRegistry(): ExtensionRegistry {
+    val registry = ExtensionRegistry.newInstance()!!
+    DebugJvmProtoBuf.registerAllExtensions(registry)
+    return registry
+}
+
+private fun fileToStringRepresentation(file: File): String {
+    return when {
+        file.name.endsWith(".class") -> {
+            classFileToString(file)
+        }
+        else -> {
+            file.readText()
+        }
+    }
+}

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

@@ -0,0 +1,181 @@
+/*
+ * 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.
+ * 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.incremental.testingUtils
+
+import com.intellij.openapi.util.io.FileUtil
+import java.io.File
+import java.util.*
+
+private val COMMANDS = listOf("new", "touch", "delete")
+private val COMMANDS_AS_REGEX_PART = COMMANDS.joinToString("|")
+private val COMMANDS_AS_MESSAGE_PART = COMMANDS.joinToString("/") { "\".$it\"" }
+
+enum class TouchPolicy {
+    TIMESTAMP,
+    CHECKSUM
+}
+
+fun copyTestSources(testDataDir: File, sourceDestinationDir: File, filePrefix: String): Map<File, File> {
+    val mapping = hashMapOf<File, File>()
+    FileUtil.copyDir(testDataDir, sourceDestinationDir) {
+        it.isDirectory || it.name.startsWith(filePrefix) && (it.name.endsWith(".kt") || it.name.endsWith(".java"))
+    }
+
+    for (file in sourceDestinationDir.walk()) {
+        if (!file.isFile) continue
+
+        val renamedFile =
+                if (filePrefix.isEmpty()) {
+                    file
+                }
+                else {
+                    File(sourceDestinationDir, file.name.removePrefix(filePrefix)).apply {
+                        file.renameTo(this)
+                    }
+                }
+
+        mapping[renamedFile] = File(testDataDir, file.name)
+    }
+
+    return mapping
+}
+
+fun getModificationsToPerform(
+        testDataDir: File,
+        moduleNames: Collection<String>?,
+        allowNoFilesWithSuffixInTestData: Boolean,
+        touchPolicy: TouchPolicy
+): List<List<Modification>> {
+
+    fun getModificationsForIteration(newSuffix: String, touchSuffix: String, deleteSuffix: String): List<Modification> {
+
+        fun splitToModuleNameAndFileName(fileName: String): Pair<String?, String> {
+            val underscore = fileName.indexOf("_")
+
+            if (underscore != -1) {
+                val module = fileName.substring(0, underscore)
+
+                assert(moduleNames != null) { "File name has module prefix, but multi-module environment is absent" }
+                assert(module in moduleNames!!) { "Module not found for file with prefix: $fileName" }
+
+                return Pair(module, fileName.substring(underscore + 1))
+            }
+
+            assert(moduleNames == null) { "Test is multi-module, but file has no module prefix: $fileName" }
+            return Pair(null, fileName)
+        }
+
+        val rules = mapOf<String, (String, File) -> Modification>(
+                newSuffix to { path, file -> ModifyContent(path, file) },
+                touchSuffix to { path, file -> TouchFile(path, touchPolicy) },
+                deleteSuffix to { path, file -> DeleteFile(path) }
+        )
+
+        val modifications = ArrayList<Modification>()
+
+        for (file in testDataDir.walkTopDown()) {
+            if (!file.isFile) continue
+
+            val relativeFilePath = file.toRelativeString(testDataDir)
+
+            val (suffix, createModification) = rules.entries.firstOrNull { file.path.endsWith(it.key) } ?: continue
+
+            val (moduleName, fileName) = splitToModuleNameAndFileName(relativeFilePath)
+            val srcDir = moduleName?.let { "$it/src" } ?: "src"
+            modifications.add(createModification(srcDir + "/" + fileName.removeSuffix(suffix), file))
+        }
+
+        return modifications
+    }
+
+    val haveFilesWithoutNumbers = testDataDir.walkTopDown().any { it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }
+    val haveFilesWithNumbers = testDataDir.walkTopDown().any { it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }
+
+    if (haveFilesWithoutNumbers && haveFilesWithNumbers) {
+        throw IllegalStateException("Bad test data format: files ending with both unnumbered and numbered ${COMMANDS_AS_MESSAGE_PART} were found")
+    }
+    if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) {
+        if (allowNoFilesWithSuffixInTestData) {
+            return listOf(listOf())
+        }
+        else {
+            throw IllegalStateException("Bad test data format: no files ending with ${COMMANDS_AS_MESSAGE_PART} found")
+        }
+    }
+
+    if (haveFilesWithoutNumbers) {
+        return listOf(getModificationsForIteration(".new", ".touch", ".delete"))
+    }
+    else {
+        return (1..10)
+                .map { getModificationsForIteration(".new.$it", ".touch.$it", ".delete.$it") }
+                .filter { it.isNotEmpty() }
+    }
+}
+
+abstract class Modification(val path: String) {
+    abstract fun perform(workDir: File, mapping: MutableMap<File, File>)
+
+    override fun toString(): String = "${javaClass.simpleName} $path"
+}
+
+class ModifyContent(path: String, val dataFile: File) : Modification(path) {
+    override fun perform(workDir: File, mapping: MutableMap<File, File>) {
+        val file = File(workDir, path)
+
+        val oldLastModified = file.lastModified()
+        file.delete()
+        dataFile.copyTo(file)
+
+        val newLastModified = file.lastModified()
+        if (newLastModified <= oldLastModified) {
+            //Mac OS and some versions of Linux truncate timestamp to nearest second
+            file.setLastModified(oldLastModified + 1000)
+        }
+
+        mapping[file] = dataFile
+    }
+}
+
+class TouchFile(path: String, private val touchPolicy: TouchPolicy) : Modification(path) {
+    override fun perform(workDir: File, mapping: MutableMap<File, File>) {
+        val file = File(workDir, path)
+
+        when (touchPolicy) {
+            TouchPolicy.TIMESTAMP -> {
+                val oldLastModified = file.lastModified()
+                //Mac OS and some versions of Linux truncate timestamp to nearest second
+                file.setLastModified(Math.max(System.currentTimeMillis(), oldLastModified + 1000))
+            }
+            TouchPolicy.CHECKSUM -> {
+                file.appendText(" ")
+            }
+        }
+
+    }
+}
+
+class DeleteFile(path: String) : Modification(path) {
+    override fun perform(workDir: File, mapping: MutableMap<File, File>) {
+        val fileToDelete = File(workDir, path)
+        if (!fileToDelete.delete()) {
+            throw AssertionError("Couldn't delete $fileToDelete")
+        }
+
+        mapping.remove(fileToDelete)
+    }
+}

build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java

@@ -0,0 +1,100 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/deserialization/src/ext_options.debug.proto
+
+package org.jetbrains.kotlin.serialization;
+
+public final class DebugExtOptionsProtoBuf {
+  private DebugExtOptionsProtoBuf() {}
+  public static void registerAllExtensions(
+      org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.skipInComparison);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+  }
+  public static final int SKIP_IN_COMPARISON_FIELD_NUMBER = 50000;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> skipInComparison = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int NAME_ID_IN_TABLE_FIELD_NUMBER = 50001;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> nameIdInTable = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int FQ_NAME_ID_IN_TABLE_FIELD_NUMBER = 50002;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> fqNameIdInTable = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int STRING_ID_IN_TABLE_FIELD_NUMBER = 50003;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> stringIdInTable = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+
+  public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n0core/deserialization/src/ext_options.d" +
+      "ebug.proto\022\"org.jetbrains.kotlin.seriali" +
+      "zation\032 google/protobuf/descriptor.proto" +
+      ":;\n\022skip_in_comparison\022\035.google.protobuf" +
+      ".FieldOptions\030\320\206\003 \001(\010:9\n\020name_id_in_tabl" +
+      "e\022\035.google.protobuf.FieldOptions\030\321\206\003 \001(\010" +
+      ":<\n\023fq_name_id_in_table\022\035.google.protobu" +
+      "f.FieldOptions\030\322\206\003 \001(\010:;\n\022string_id_in_t" +
+      "able\022\035.google.protobuf.FieldOptions\030\323\206\003 " +
+      "\001(\010B\031B\027DebugExtOptionsProtoBuf"
+    };
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
+          org.jetbrains.kotlin.protobuf.DescriptorProtos.getDescriptor(),
+        }, assigner);
+    skipInComparison.internalInit(descriptor.getExtensions().get(0));
+    nameIdInTable.internalInit(descriptor.getExtensions().get(1));
+    fqNameIdInTable.internalInit(descriptor.getExtensions().get(2));
+    stringIdInTable.internalInit(descriptor.getExtensions().get(3));
+    org.jetbrains.kotlin.protobuf.DescriptorProtos.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

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

@@ -6,12 +6,12 @@ package org.jetbrains.kotlin.serialization.jvm;
 public final class DebugJvmPackageTable {
   private DebugJvmPackageTable() {}
   public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
+      org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
   }
-  public interface PackageTableOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface PackageTableOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
      */
@@ -40,14 +40,15 @@ public final class DebugJvmPackageTable {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
    */
   public static final class PackageTable extends
-      com.google.protobuf.GeneratedMessage
-      implements PackageTableOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      PackageTableOrBuilder {
     // Use PackageTable.newBuilder() to construct.
-    private PackageTable(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private PackageTable(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private PackageTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
     private static final PackageTable defaultInstance;
     public static PackageTable getDefaultInstance() {
@@ -58,20 +59,20 @@ public final class DebugJvmPackageTable {
       return defaultInstance;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    private final org.jetbrains.kotlin.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
+    public final org.jetbrains.kotlin.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
     }
     private PackageTable(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        org.jetbrains.kotlin.protobuf.CodedInputStream input,
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
+      org.jetbrains.kotlin.protobuf.UnknownFieldSet.Builder unknownFields =
+          org.jetbrains.kotlin.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -97,10 +98,10 @@ public final class DebugJvmPackageTable {
             }
           }
         }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
+        throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -110,34 +111,33 @@ public final class DebugJvmPackageTable {
         makeExtensionsImmutable();
       }
     }
-    public static final com.google.protobuf.Descriptors.Descriptor
+    public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PackageTable> PARSER =
-        new com.google.protobuf.AbstractParser<PackageTable>() {
+    public static org.jetbrains.kotlin.protobuf.Parser<PackageTable> PARSER =
+        new org.jetbrains.kotlin.protobuf.AbstractParser<PackageTable>() {
       public PackageTable parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
+          org.jetbrains.kotlin.protobuf.CodedInputStream input,
+          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return new PackageTable(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<PackageTable> getParserForType() {
+    public org.jetbrains.kotlin.protobuf.Parser<PackageTable> getParserForType() {
       return PARSER;
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
     public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
     private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_;
     /**
@@ -179,7 +179,8 @@ public final class DebugJvmPackageTable {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       for (int i = 0; i < getPackagePartsCount(); i++) {
         if (!getPackageParts(i).isInitialized()) {
@@ -191,7 +192,7 @@ public final class DebugJvmPackageTable {
       return true;
     }
 
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       for (int i = 0; i < packageParts_.size(); i++) {
@@ -207,7 +208,7 @@ public final class DebugJvmPackageTable {
 
       size = 0;
       for (int i = 0; i < packageParts_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
+        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
           .computeMessageSize(1, packageParts_.get(i));
       }
       size += getUnknownFields().getSerializedSize();
@@ -223,24 +224,24 @@ public final class DebugJvmPackageTable {
     }
 
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        org.jetbrains.kotlin.protobuf.ByteString data)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        org.jetbrains.kotlin.protobuf.ByteString data,
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(java.io.InputStream input)
@@ -249,7 +250,7 @@ public final class DebugJvmPackageTable {
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
@@ -259,18 +260,18 @@ public final class DebugJvmPackageTable {
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
-        com.google.protobuf.CodedInputStream input)
+        org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.jetbrains.kotlin.protobuf.CodedInputStream input,
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
@@ -284,7 +285,7 @@ public final class DebugJvmPackageTable {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -292,14 +293,15 @@ public final class DebugJvmPackageTable {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
+      public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -312,12 +314,12 @@ public final class DebugJvmPackageTable {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
           getPackagePartsFieldBuilder();
         }
       }
@@ -340,7 +342,7 @@ public final class DebugJvmPackageTable {
         return create().mergeFrom(buildPartial());
       }
 
-      public com.google.protobuf.Descriptors.Descriptor
+      public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
       }
@@ -373,7 +375,7 @@ public final class DebugJvmPackageTable {
         return result;
       }
 
-      public Builder mergeFrom(com.google.protobuf.Message other) {
+      public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
         if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable) {
           return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable)other);
         } else {
@@ -403,7 +405,7 @@ public final class DebugJvmPackageTable {
               packageParts_ = other.packageParts_;
               bitField0_ = (bitField0_ & ~0x00000001);
               packagePartsBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getPackagePartsFieldBuilder() : null;
             } else {
               packagePartsBuilder_.addAllMessages(other.packageParts_);
@@ -425,13 +427,13 @@ public final class DebugJvmPackageTable {
       }
 
       public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          org.jetbrains.kotlin.protobuf.CodedInputStream input,
+          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable) e.getUnfinishedMessage();
           throw e;
         } finally {
@@ -443,7 +445,6 @@ public final class DebugJvmPackageTable {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
       private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_ =
         java.util.Collections.emptyList();
       private void ensurePackagePartsIsMutable() {
@@ -453,7 +454,7 @@ public final class DebugJvmPackageTable {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
           org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> packagePartsBuilder_;
 
       /**
@@ -585,7 +586,8 @@ public final class DebugJvmPackageTable {
           java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> values) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
-          super.addAll(values, packageParts_);
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, packageParts_);
           onChanged();
         } else {
           packagePartsBuilder_.addAllMessages(values);
@@ -668,11 +670,11 @@ public final class DebugJvmPackageTable {
            getPackagePartsBuilderList() {
         return getPackagePartsFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
           org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
           getPackagePartsFieldBuilder() {
         if (packagePartsBuilder_ == null) {
-          packagePartsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          packagePartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
               org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder>(
                   packageParts_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
@@ -694,10 +696,10 @@ public final class DebugJvmPackageTable {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
   }
 
-  public interface PackagePartsOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface PackagePartsOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // required string package_fq_name = 1;
     /**
      * <code>required string package_fq_name = 1;</code>
      */
@@ -709,15 +711,14 @@ public final class DebugJvmPackageTable {
     /**
      * <code>required string package_fq_name = 1;</code>
      */
-    com.google.protobuf.ByteString
+    org.jetbrains.kotlin.protobuf.ByteString
         getPackageFqNameBytes();
 
-    // repeated string class_name = 2;
     /**
      * <code>repeated string class_name = 2;</code>
      */
-    java.util.List<java.lang.String>
-    getClassNameList();
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getClassNameList();
     /**
      * <code>repeated string class_name = 2;</code>
      */
@@ -729,21 +730,22 @@ public final class DebugJvmPackageTable {
     /**
      * <code>repeated string class_name = 2;</code>
      */
-    com.google.protobuf.ByteString
+    org.jetbrains.kotlin.protobuf.ByteString
         getClassNameBytes(int index);
   }
   /**
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
    */
   public static final class PackageParts extends
-      com.google.protobuf.GeneratedMessage
-      implements PackagePartsOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      PackagePartsOrBuilder {
     // Use PackageParts.newBuilder() to construct.
-    private PackageParts(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private PackageParts(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private PackageParts(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
     private static final PackageParts defaultInstance;
     public static PackageParts getDefaultInstance() {
@@ -754,20 +756,20 @@ public final class DebugJvmPackageTable {
       return defaultInstance;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    private final org.jetbrains.kotlin.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
+    public final org.jetbrains.kotlin.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
     }
     private PackageParts(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        org.jetbrains.kotlin.protobuf.CodedInputStream input,
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
+      org.jetbrains.kotlin.protobuf.UnknownFieldSet.Builder unknownFields =
+          org.jetbrains.kotlin.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -784,62 +786,63 @@ public final class DebugJvmPackageTable {
               break;
             }
             case 10: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              packageFqName_ = input.readBytes();
+              packageFqName_ = bs;
               break;
             }
             case 18: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                className_ = new com.google.protobuf.LazyStringArrayList();
+                className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              className_.add(input.readBytes());
+              className_.add(bs);
               break;
             }
           }
         }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
+        throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-          className_ = new com.google.protobuf.UnmodifiableLazyStringList(className_);
+          className_ = className_.getUnmodifiableView();
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final com.google.protobuf.Descriptors.Descriptor
+    public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PackageParts> PARSER =
-        new com.google.protobuf.AbstractParser<PackageParts>() {
+    public static org.jetbrains.kotlin.protobuf.Parser<PackageParts> PARSER =
+        new org.jetbrains.kotlin.protobuf.AbstractParser<PackageParts>() {
       public PackageParts parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
+          org.jetbrains.kotlin.protobuf.CodedInputStream input,
+          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return new PackageParts(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<PackageParts> getParserForType() {
+    public org.jetbrains.kotlin.protobuf.Parser<PackageParts> getParserForType() {
       return PARSER;
     }
 
     private int bitField0_;
-    // required string package_fq_name = 1;
     public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
     private java.lang.Object packageFqName_;
     /**
@@ -856,8 +859,8 @@ public final class DebugJvmPackageTable {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
+        org.jetbrains.kotlin.protobuf.ByteString bs = 
+            (org.jetbrains.kotlin.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           packageFqName_ = s;
@@ -868,27 +871,26 @@ public final class DebugJvmPackageTable {
     /**
      * <code>required string package_fq_name = 1;</code>
      */
-    public com.google.protobuf.ByteString
+    public org.jetbrains.kotlin.protobuf.ByteString
         getPackageFqNameBytes() {
       java.lang.Object ref = packageFqName_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
+        org.jetbrains.kotlin.protobuf.ByteString b = 
+            org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         packageFqName_ = b;
         return b;
       } else {
-        return (com.google.protobuf.ByteString) ref;
+        return (org.jetbrains.kotlin.protobuf.ByteString) ref;
       }
     }
 
-    // repeated string class_name = 2;
     public static final int CLASS_NAME_FIELD_NUMBER = 2;
-    private com.google.protobuf.LazyStringList className_;
+    private org.jetbrains.kotlin.protobuf.LazyStringList className_;
     /**
      * <code>repeated string class_name = 2;</code>
      */
-    public java.util.List<java.lang.String>
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
         getClassNameList() {
       return className_;
     }
@@ -907,19 +909,20 @@ public final class DebugJvmPackageTable {
     /**
      * <code>repeated string class_name = 2;</code>
      */
-    public com.google.protobuf.ByteString
+    public org.jetbrains.kotlin.protobuf.ByteString
         getClassNameBytes(int index) {
       return className_.getByteString(index);
     }
 
     private void initFields() {
       packageFqName_ = "";
-      className_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       if (!hasPackageFqName()) {
         memoizedIsInitialized = 0;
@@ -929,7 +932,7 @@ public final class DebugJvmPackageTable {
       return true;
     }
 
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -948,13 +951,13 @@ public final class DebugJvmPackageTable {
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
+        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
           .computeBytesSize(1, getPackageFqNameBytes());
       }
       {
         int dataSize = 0;
         for (int i = 0; i < className_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
+          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
             .computeBytesSizeNoTag(className_.getByteString(i));
         }
         size += dataSize;
@@ -973,24 +976,24 @@ public final class DebugJvmPackageTable {
     }
 
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        org.jetbrains.kotlin.protobuf.ByteString data)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        org.jetbrains.kotlin.protobuf.ByteString data,
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(java.io.InputStream input)
@@ -999,7 +1002,7 @@ public final class DebugJvmPackageTable {
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
@@ -1009,18 +1012,18 @@ public final class DebugJvmPackageTable {
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
-        com.google.protobuf.CodedInputStream input)
+        org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
     public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.jetbrains.kotlin.protobuf.CodedInputStream input,
+        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
@@ -1034,7 +1037,7 @@ public final class DebugJvmPackageTable {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1042,14 +1045,15 @@ public final class DebugJvmPackageTable {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder {
+      public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1062,12 +1066,12 @@ public final class DebugJvmPackageTable {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
       private static Builder create() {
@@ -1078,7 +1082,7 @@ public final class DebugJvmPackageTable {
         super.clear();
         packageFqName_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        className_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -1087,7 +1091,7 @@ public final class DebugJvmPackageTable {
         return create().mergeFrom(buildPartial());
       }
 
-      public com.google.protobuf.Descriptors.Descriptor
+      public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
       }
@@ -1113,8 +1117,7 @@ public final class DebugJvmPackageTable {
         }
         result.packageFqName_ = packageFqName_;
         if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          className_ = new com.google.protobuf.UnmodifiableLazyStringList(
-              className_);
+          className_ = className_.getUnmodifiableView();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.className_ = className_;
@@ -1123,7 +1126,7 @@ public final class DebugJvmPackageTable {
         return result;
       }
 
-      public Builder mergeFrom(com.google.protobuf.Message other) {
+      public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
         if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts) {
           return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts)other);
         } else {
@@ -1162,13 +1165,13 @@ public final class DebugJvmPackageTable {
       }
 
       public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          org.jetbrains.kotlin.protobuf.CodedInputStream input,
+          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts) e.getUnfinishedMessage();
           throw e;
         } finally {
@@ -1180,7 +1183,6 @@ public final class DebugJvmPackageTable {
       }
       private int bitField0_;
 
-      // required string package_fq_name = 1;
       private java.lang.Object packageFqName_ = "";
       /**
        * <code>required string package_fq_name = 1;</code>
@@ -1194,9 +1196,12 @@ public final class DebugJvmPackageTable {
       public java.lang.String getPackageFqName() {
         java.lang.Object ref = packageFqName_;
         if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
-          packageFqName_ = s;
+          org.jetbrains.kotlin.protobuf.ByteString bs =
+              (org.jetbrains.kotlin.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            packageFqName_ = s;
+          }
           return s;
         } else {
           return (java.lang.String) ref;
@@ -1205,17 +1210,17 @@ public final class DebugJvmPackageTable {
       /**
        * <code>required string package_fq_name = 1;</code>
        */
-      public com.google.protobuf.ByteString
+      public org.jetbrains.kotlin.protobuf.ByteString
           getPackageFqNameBytes() {
         java.lang.Object ref = packageFqName_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
+          org.jetbrains.kotlin.protobuf.ByteString b = 
+              org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           packageFqName_ = b;
           return b;
         } else {
-          return (com.google.protobuf.ByteString) ref;
+          return (org.jetbrains.kotlin.protobuf.ByteString) ref;
         }
       }
       /**
@@ -1244,7 +1249,7 @@ public final class DebugJvmPackageTable {
        * <code>required string package_fq_name = 1;</code>
        */
       public Builder setPackageFqNameBytes(
-          com.google.protobuf.ByteString value) {
+          org.jetbrains.kotlin.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1254,20 +1259,19 @@ public final class DebugJvmPackageTable {
         return this;
       }
 
-      // repeated string class_name = 2;
-      private com.google.protobuf.LazyStringList className_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
       private void ensureClassNameIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          className_ = new com.google.protobuf.LazyStringArrayList(className_);
+          className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(className_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
        * <code>repeated string class_name = 2;</code>
        */
-      public java.util.List<java.lang.String>
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
           getClassNameList() {
-        return java.util.Collections.unmodifiableList(className_);
+        return className_.getUnmodifiableView();
       }
       /**
        * <code>repeated string class_name = 2;</code>
@@ -1284,7 +1288,7 @@ public final class DebugJvmPackageTable {
       /**
        * <code>repeated string class_name = 2;</code>
        */
-      public com.google.protobuf.ByteString
+      public org.jetbrains.kotlin.protobuf.ByteString
           getClassNameBytes(int index) {
         return className_.getByteString(index);
       }
@@ -1320,7 +1324,8 @@ public final class DebugJvmPackageTable {
       public Builder addAllClassName(
           java.lang.Iterable<java.lang.String> values) {
         ensureClassNameIsMutable();
-        super.addAll(values, className_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, className_);
         onChanged();
         return this;
       }
@@ -1328,7 +1333,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        */
       public Builder clearClassName() {
-        className_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1337,7 +1342,7 @@ public final class DebugJvmPackageTable {
        * <code>repeated string class_name = 2;</code>
        */
       public Builder addClassNameBytes(
-          com.google.protobuf.ByteString value) {
+          org.jetbrains.kotlin.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1358,22 +1363,22 @@ public final class DebugJvmPackageTable {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
   }
 
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
   private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
   private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor
+  public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static com.google.protobuf.Descriptors.FileDescriptor
+  private static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -1386,31 +1391,31 @@ public final class DebugJvmPackageTable {
       "\nclass_name\030\002 \003(\tB\026B\024DebugJvmPackageTabl" +
       "e"
     };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
-            com.google.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
-              new java.lang.String[] { "PackageParts", });
-          internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
-              new java.lang.String[] { "PackageFqName", "ClassName", });
-          return null;
-        }
-      };
-    com.google.protobuf.Descriptors.FileDescriptor
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
         }, assigner);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
+        new java.lang.String[] { "PackageParts", });
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    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", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
-}
+}

build.xml

@@ -6,21 +6,26 @@
     <!-- Set to false to disable compiler's javadoc generation. Speeds up the build -->
     <property name="generate.javadoc" value="true"/>
 
+    <!-- Set to false to prevent jarjar and metadata stripping on kotlin-reflect.jar and reflection sources. Use to debug reflection -->
+    <property name="obfuscate.reflect" value="true"/>
+
     <property name="max.heap.size.for.forked.jvm" value="1024m"/>
 
     <property name="bootstrap.home" value="${basedir}/dependencies/bootstrap-compiler"/>
     <property name="bootstrap.compiler.home" value="${bootstrap.home}/Kotlin/kotlinc"/>
     <property name="bootstrap.runtime" value="${bootstrap.compiler.home}/lib/kotlin-runtime.jar"/>
     <property name="bootstrap.reflect" value="${bootstrap.compiler.home}/lib/kotlin-reflect.jar"/>
+    <property name="bootstrap.kotlin.test" value="${bootstrap.compiler.home}/lib/kotlin-test.jar" />
 
     <property name="output" value="${basedir}/dist"/>
+    <property name="js.stdlib.output.dir" value="${output}/js"/>
     <property name="intermediate-sources" value="out/src" />
     <property name="kotlin-home" value="${output}/kotlinc"/>
     <property name="build.number" value="snapshot"/>
     <property name="bootstrap.build.no.tests" value="false"/>
     <property name="idea.sdk" value="${basedir}/ideaSDK"/>
-    <property name="protobuf.jar" value="${idea.sdk}/lib/protobuf-2.5.0.jar"/>
-    <property name="protobuf-lite.jar" value="${basedir}/dependencies/protobuf-2.5.0-lite.jar"/>
+    <property name="protobuf.jar" value="${basedir}/dependencies/protobuf-2.6.1.jar"/>
+    <property name="protobuf-lite.jar" value="${basedir}/dependencies/protobuf-2.6.1-lite.jar"/>
     <property name="javax.inject.jar" value="${basedir}/lib/javax.inject.jar"/>
 
     <property name="java.target" value="1.6"/>
@@ -38,6 +43,10 @@
 
     <include file="jslib_files.xml" />
 
+    <property name="compiled.stdlib.js" value="stdlib.js"/>
+    <property name="compiled.stdlib.meta.js" value="kotlin.meta.js"/>
+    <property name="stdlib.js.dir" value="${basedir}/js/js.translator/testData"/>
+
     <!--
     The compiler produced on the first step of the build (Bootstrap No Tests) is only guaranteed to work against the OLD runtime
     located in dependencies/bootstrap-compiler/.../kotlin-runtime.jar, because the newly built compiler is just a Kotlin application,
@@ -55,6 +64,7 @@
 
     <path id="classpath">
         <file file="${bootstrap.runtime}"/>
+        <file file="${bootstrap.kotlin.test}" />
         <file file="${bootstrap.reflect}"/>
         <fileset dir="${idea.sdk}" includes="core/*.jar"/>
         <pathelement location="${protobuf.jar}"/>
@@ -62,7 +72,7 @@
         <fileset dir="${basedir}/lib" includes="**/*.jar"/>
         <fileset dir="${dependencies.dir}" includes="jansi.jar"/>
         <fileset dir="${dependencies.dir}" includes="jline.jar"/>
-        <fileset dir="${dependencies.dir}" includes="cli-parser-1.1.1.jar"/>
+        <fileset dir="${dependencies.dir}" includes="cli-parser-1.1.2.jar"/>
         <fileset dir="${basedir}/ideaSDK/jps" includes="jps-model.jar"/>
     </path>
 
@@ -88,11 +98,12 @@
         <include name="compiler/conditional-preprocessor/src/"/>
         <include name="compiler/container/src"/>
         <include name="compiler/frontend/src"/>
+        <include name="compiler/resolution/src"/>
         <include name="compiler/frontend.java/src"/>
         <include name="compiler/light-classes/src"/>
         <include name="compiler/plugin-api/src"/>
-        <include name="compiler/rmi/rmi-server/src"/>
-        <include name="compiler/rmi/rmi-interface/src"/>
+        <include name="compiler/daemon/src"/>
+        <include name="compiler/daemon/daemon-common/src"/>
         <include name="compiler/serialization/src"/>
         <include name="compiler/util/src"/>
         <include name="js/js.dart-ast/src"/>
@@ -107,6 +118,7 @@
     <property name="idea.out" value="${basedir}/out/production"/>
     <patternset id="compilerClassesFromIDEA.fileset">
         <include name="frontend/**"/>
+        <include name="resolution/**"/>
         <include name="container/**"/>
         <include name="descriptors/**"/>
         <include name="deserialization/**"/>
@@ -118,8 +130,7 @@
         <include name="cli/**"/>
         <include name="cli-common/**"/>
         <include name="conditional-preprocessor/**"/>
-        <include name="rmi-server/**"/>
-        <include name="rmi-interface/**"/>
+        <include name="daemon/**"/>
         <include name="util/**"/>
         <include name="util.runtime/**"/>
         <include name="light-classes/**"/>
@@ -178,19 +189,33 @@
         <sequential if:true="${bootstrap.or.local.build}">
             <copy file="${bootstrap.runtime}" tofile="${kotlin-home}/lib/kotlin-runtime-internal-bootstrap.jar"/>
             <copy file="${bootstrap.reflect}" tofile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar"/>
+            <copy file="${bootstrap.kotlin.test}" tofile="${kotlin-home}/lib/kotlin-test-internal-bootstrap.jar" failonerror="false"/>
             <jar destfile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar" update="true">
                 <manifest>
                     <attribute name="Class-Path" value="kotlin-runtime-internal-bootstrap.jar"/>
                 </manifest>
             </jar>
+            <jar destfile="${kotlin-home}/lib/kotlin-test-internal-bootstrap.jar" update="true">
+                <manifest>
+                    <attribute name="Class-Path" value="kotlin-runtime-internal-bootstrap.jar"/>
+                </manifest>
+            </jar>
         </sequential>
 
         <sequential unless:true="${bootstrap.or.local.build}">
             <copy file="${bootstrap.runtime}" todir="${kotlin-home}/lib"/>
             <copy file="${bootstrap.reflect}" todir="${kotlin-home}/lib"/>
+            <copy file="${bootstrap.kotlin.test}" todir="${kotlin-home}/lib"/>
         </sequential>
     </target>
 
+    <target name="copy-dist-to-bootstrap">
+        <delete dir="${basedir}/dependencies/bootstrap-compiler/Kotlin/kotlinc" />
+        <copy todir="${basedir}/dependencies/bootstrap-compiler/Kotlin/kotlinc">
+            <fileset dir="${basedir}/dist/kotlinc" />
+        </copy>
+    </target>
+
     <target name="compiler-sources">
         <jar jarfile="${output}/kotlin-compiler-sources.jar">
             <!-- TODO How to convert it from pathset or dirset ? -->
@@ -204,10 +229,11 @@
             <fileset dir="compiler/cli/src"/>
             <fileset dir="compiler/cli/cli-common/src"/>
             <fileset dir="compiler/conditional-preprocessor/src"/>
-            <fileset dir="compiler/rmi/rmi-server/src"/>
-            <fileset dir="compiler/rmi/rmi-interface/src"/>
+            <fileset dir="compiler/daemon/src"/>
+            <fileset dir="compiler/daemon/daemon-common/src"/>
             <fileset dir="compiler/container/src"/>
             <fileset dir="compiler/frontend/src"/>
+            <fileset dir="compiler/resolution/src"/>
             <fileset dir="compiler/frontend.java/src"/>
             <fileset dir="compiler/light-classes/src"/>
             <fileset dir="compiler/plugin-api/src"/>
@@ -293,48 +319,32 @@
                 <arg value="-output"/>
                 <arg value="@{output}"/>
                 <arg value="-no-stdlib"/>
+                <arg value="-version"/>
                 <arg value="-meta-info"/>
+                <arg value="-kjsm"/>
                 <arg line="-main noCall"/>
+                <arg line="-module-kind commonjs"/>
             </java>
         </sequential>
     </macrodef>
 
-    <target name="js-stdlib">
-        <property name="compiled.builtins.js" value="builtins.js"/>
-        <property name="compiled.builtins.meta.js" value="builtins.meta.js"/>
-        <property name="compiled.stdlib.js" value="stdlib.js"/>
-        <property name="compiled.stdlib.meta.js" value="stdlib.meta.js"/>
-        <property name="stdlib.js.dir" value="${basedir}/js/js.translator/testData"/>
-
-        <kotlin-pp src="libraries/stdlib/src" output="${intermediate-sources}/stdlib/js" profile="JS" />
-
-        <new-kotlin2js output="${output}/${compiled.builtins.js}">
-            <src>
-                <fileset refid="kotlin.builtin.files"/>
-            </src>
-        </new-kotlin2js>
-
-        <new-kotlin2js output="${output}/${compiled.stdlib.js}">
-            <src>
-                <resources refid="js.lib.files"/>
-            </src>
-        </new-kotlin2js>
-
-        <taskdef name="closure-compiler"
-                 classname="com.google.javascript.jscomp.ant.CompileTask"
-                 classpath="${dependencies.dir}/closure-compiler.jar"/>
-
+    <target name="js-stdlib-merge">
         <!-- value should be one of: whitespace, simple, advanced -->
         <property name="compilationLevel" value="whitespace"/>
         <!-- value should be one of: default, quiet, verbose -->
         <property name="warningLevel" value="default"/>
 
+        <taskdef name="closure-compiler"
+                 classname="com.google.javascript.jscomp.ant.CompileTask"
+                 classpath="${dependencies.dir}/closure-compiler.jar"/>
+
         <closure-compiler
             compilationLevel="${compilationLevel}"
             prettyprint="true"
             languagein="ECMASCRIPT5_STRICT"
             warning="${warningLevel}"
-            output="${output}/kotlin.js">
+            output="${js.stdlib.output.dir}/kotlin.js"
+            outputWrapperFile="${stdlib.js.dir}/closure-wrapper.txt">
 
             <sources dir="${stdlib.js.dir}">
                 <file name="kotlin_lib_ecma5.js"/>
@@ -343,27 +353,61 @@
                 <file name="long.js"/>
             </sources>
 
-            <sources dir="${output}">
-                <file name="${compiled.builtins.js}"/>
-            </sources>
-
-            <sources dir="${output}">
+            <sources dir="${js.stdlib.output.dir}">
                 <file name="${compiled.stdlib.js}"/>
             </sources>
 
             <sources dir="${stdlib.js.dir}">
-                <file name="export_Kotlin_if_possible.js"/>
+                <file name="merge.js"/>
             </sources>
 
             <externs dir="${stdlib.js.dir}">
                 <file name="externs.js"/>
             </externs>
         </closure-compiler>
+    </target>
+
+    <target name="js-stdlib">
+        <property environment="env"/>
+        <kotlin-pp src="libraries/stdlib/src" output="${intermediate-sources}/stdlib/js" profile="JS" />
+
+        <new-kotlin2js output="${js.stdlib.output.dir}/tmp/kotlin.js">
+            <src>
+                <union>
+                    <fileset refid="kotlin.builtin.files"/>
+                    <resources refid="js.lib.files"/>
+                </union>
+            </src>
+        </new-kotlin2js>
+        <move file="${js.stdlib.output.dir}/tmp/kotlin.js" tofile="${js.stdlib.output.dir}/${compiled.stdlib.js}" />
+        <move file="${js.stdlib.output.dir}/tmp/kotlin" todir="${js.stdlib.output.dir}" />
+        <move file="${js.stdlib.output.dir}/tmp/${compiled.stdlib.meta.js}" tofile="${js.stdlib.output.dir}/${compiled.stdlib.meta.js}" />
+
+        <condition property="jdk17" value="${env.JDK_17}" else="${env.JAVA_HOME}">
+            <isset property="env.JDK_17" />
+        </condition>
+        <java classname="org.apache.tools.ant.launch.Launcher"
+              fork="true"
+              failonerror="true"
+              timeout="4000000"
+              taskname="startAnt"
+              jvm="${jdk17}/bin/java">
+            <env key="JAVA_HOME" value="${jdk17}"/>
+            <classpath>
+                <pathelement location="${ant.home}/lib/ant-launcher.jar"/>
+            </classpath>
+            <arg line="-f" />
+            <arg line="build.xml" />
+            <arg line="js-stdlib-merge" />
+        </java>
 
         <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar" duplicate="fail">
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-            <zipfileset file="${output}/kotlin.js" prefix=""/>
-            <zipfileset file="${output}/${compiled.stdlib.meta.js}" prefix=""/>
+            <zipfileset dir="${js.stdlib.output.dir}" prefix="">
+                <include name="kotlin.js"/>
+                <include name="${compiled.stdlib.meta.js}"/>
+                <include name="kotlin/**"/>
+            </zipfileset>
 
             <manifest>
                 <attribute name="Built-By" value="${manifest.impl.vendor}"/>
@@ -462,11 +506,17 @@
         <attribute name="compress" default="true"/>
 
         <sequential>
+            <local name="idea.core.uberjar.exists"/>
+            <available file="${dependencies.dir}/idea/idea-core-all.jar" property="idea.core.uberjar.exists"/>
+            <!-- TODO: move this jar creation to update_dependencies.xml eventually -->
+            <jar jarfile="${dependencies.dir}/idea/idea-core-all.jar" unless:true="${idea.core.uberjar.exists}">
+                <zipgroupfileset dir="${idea.sdk}/core" includes="*.jar" excludes="util.jar"/>
+            </jar>
+
             <jar jarfile="@{jarfile}" compress="@{compress}" duplicate="preserve">
                 <fileset dir="${output}/classes/compiler"/>
                 <fileset dir="${output}/builtins">
                     <include name="kotlin/**"/>
-                    <exclude name="kotlin/internal/**"/>
                 </fileset>
                 <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
@@ -481,12 +531,12 @@
                 </fileset>
 
                 <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
-                <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
+                <zipfileset src="${dependencies.dir}/idea/idea-core-all.jar" excludes="META-INF/INDEX.LIST"/>
                 <zipfileset src="${idea.sdk}/lib/jna-platform.jar"/>
                 <zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
                 <zipfileset src="${idea.sdk}/jps/jps-model.jar"/>
                 <zipfileset src="${dependencies.dir}/jline.jar"/>
-                <zipfileset src="${dependencies.dir}/cli-parser-1.1.1.jar"/>
+                <zipfileset src="${dependencies.dir}/cli-parser-1.1.2.jar"/>
                 <zipfileset src="${protobuf.jar}"/>
 
                 <manifest>
@@ -528,8 +578,10 @@
 
         <javac2 destdir="${output}/classes/compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
-            <withKotlin modulename="kotlin-compiler"/>
-            <skip pattern="kotlin/jvm/internal/.*"/>
+            <withKotlin modulename="kotlin-compiler">
+                <compilerarg value="-version"/>
+            </withKotlin>
+            <skip pattern="kotlin/Metadata"/>
             <src refid="compilerSources.path"/>
             <classpath refid="classpath"/>
         </javac2>
@@ -580,12 +632,95 @@
         </jar>
     </target>
 
-    <target name="kotlinr">
-        <cleandir dir="${output}/classes/kotlinr"/>
+    <target name="kotlin-build-common">
+        <cleandir dir="${output}/classes/kotlin-build-common"/>
 
-        <kotlinc output="${output}/classes/kotlinr" modulename="kotlin-rmi">
+        <javac2 destdir="${output}/classes/kotlin-build-common" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
+                source="${java.target}" target="${java.target}">
+            <withKotlin modulename="kotlin-build-common">
+                <compilerarg value="-version"/>
+            </withKotlin>
+            <skip pattern="kotlin/Metadata"/>
             <src>
-                <pathelement path="compiler/rmi/kotlinr/src"/>
+                <pathelement path="build-common/src"/>
+            </src>
+            <classpath>
+                <pathelement path="${bootstrap.runtime}"/>
+                <pathelement path="${bootstrap.reflect}"/>
+                <pathelement path="${idea.sdk}/lib/util.jar"/>
+                <pathelement path="${kotlin-home}/lib/kotlin-compiler.jar"/>
+            </classpath>
+        </javac2>
+
+        <jar destfile="${kotlin-home}/lib/kotlin-build-common.jar">
+            <fileset dir="${output}/classes/kotlin-build-common"/>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.common}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
+
+        <jar jarfile="${output}/kotlin-build-common-sources.jar">
+            <fileset dir="build-common/src"/>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.common.sources}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="kotlin-build-common-test">
+        <cleandir dir="${output}/classes/kotlin-build-common-test"/>
+
+        <javac2 destdir="${output}/classes/kotlin-build-common-test" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
+                source="${java.target}" target="${java.target}">
+            <withKotlin modulename="kotlin-build-common"/>
+            <skip pattern="kotlin/Metadata"/>
+            <src path="build-common/test"/>
+            <classpath>
+                <pathelement path="${bootstrap.runtime}"/>
+                <pathelement path="${bootstrap.reflect}"/>
+                <pathelement path="${bootstrap.kotlin.test}"/>
+                <pathelement path="${protobuf.jar}"/>
+                <pathelement path="${idea.sdk}/lib/junit-4.12.jar"/>
+                <pathelement path="${kotlin-home}/lib/kotlin-build-common.jar"/>
+                <pathelement path="${kotlin-home}/lib/kotlin-compiler.jar"/>
+            </classpath>
+        </javac2>
+
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="dependencies/jarjar.jar"/>
+
+        <jarjar jarfile="${kotlin-home}/lib/kotlin-build-common-test.jar">
+            <fileset dir="${output}/classes/kotlin-build-common-test"/>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+            <zipfileset src="${protobuf.jar}"/>
+            <rule pattern="com.intellij.**" result="org.jetbrains.kotlin.com.intellij.@1"/>
+
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.common}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jarjar>
+    </target>
+
+    <target name="daemon-client">
+        <cleandir dir="${output}/classes/daemon-client"/>
+
+        <kotlinc output="${output}/classes/daemon-client" modulename="client">
+            <src>
+                <pathelement path="compiler/daemon/daemon-client/src"/>
             </src>
             <classpath>
                 <pathelement path="${bootstrap.runtime}"/>
@@ -595,20 +730,30 @@
             </classpath>
         </kotlinc>
 
-        <jar destfile="${kotlin-home}/lib/kotlinr.jar">
-            <fileset dir="${output}/classes/kotlinr"/>
+        <jar destfile="${kotlin-home}/lib/kotlin-daemon-client.jar">
+            <fileset dir="${output}/classes/daemon-client"/>
             <zipfileset src="${dependencies.dir}/native-platform-uberjar.jar" includes="**" />
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.daemon-client}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
         </jar>
     </target>
 
-    <target name="android-compiler-plugin">
-        <cleandir dir="${output}/classes/android-compiler-plugin"/>
-        <javac2 destdir="${output}/classes/android-compiler-plugin" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
-            <withKotlin modulename="kotlin-android-compiler-plugin"/>
-            <skip pattern="kotlin/jvm/internal/.*"/>
+    <target name="android-extensions-compiler">
+        <cleandir dir="${output}/classes/android-extensions/android-extensions-compiler"/>
+        <javac2 destdir="${output}/classes/android-extensions/android-extensions-compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
+            <withKotlin modulename="kotlin-android-extensions-compiler">
+                <compilerarg value="-version"/>
+            </withKotlin>
+            <skip pattern="kotlin/Metadata"/>
             <src>
-                <pathelement path="plugins/android-compiler-plugin/src"/>
+                <pathelement path="plugins/android-extensions/android-extensions-compiler/src"/>
             </src>
             <classpath>
                 <pathelement path="${idea.sdk}/core/intellij-core.jar"/>
@@ -618,10 +763,10 @@
             </classpath>
         </javac2>
 
-        <jar destfile="${kotlin-home}/lib/android-compiler-plugin.jar">
-            <fileset dir="${output}/classes/android-compiler-plugin"/>
+        <jar destfile="${kotlin-home}/lib/android-extensions-compiler.jar">
+            <fileset dir="${output}/classes/android-extensions/android-extensions-compiler"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-            <fileset dir="${basedir}/plugins/android-compiler-plugin/src" includes="META-INF/services/**"/>
+            <fileset dir="${basedir}/plugins/android-extensions/android-extensions-compiler/src" includes="META-INF/services/**"/>
         </jar>
     </target>
 
@@ -629,8 +774,10 @@
         <cleandir dir="${output}/classes/ant"/>
         <javac2 destdir="${output}/classes/ant" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
-            <withKotlin modulename="kotlin-ant-tools"/>
-            <skip pattern="kotlin/jvm/internal/.*"/>
+            <withKotlin modulename="kotlin-ant-tools">
+                <compilerarg value="-version"/>
+            </withKotlin>
+            <skip pattern="kotlin/Metadata"/>
             <src>
                 <dirset dir="${basedir}/ant">
                     <include name="src"/>
@@ -662,30 +809,6 @@
         </jar>
     </target>
 
-    <target name="jdk-annotations">
-        <jar destfile="${kotlin-home}/lib/kotlin-jdk-annotations.jar">
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.jdk.annotations}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="android-sdk-annotations">
-        <jar destfile="${kotlin-home}/lib/kotlin-android-sdk-annotations.jar">
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.android.sdk.annotations}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
-    </target>
-
     <macrodef name="new-kotlinc">
         <attribute name="output"/>
         <attribute name="moduleName"/>
@@ -722,16 +845,18 @@
                 <arg value="-d"/>
                 <arg value="@{output}"/>
                 <arg value="-no-stdlib"/>
+                <arg value="-version"/>
                 <arg line="@{additionalOptions}"/>
                 <arg value="-classpath"/>
                 <arg value="${toString:classpath.path}"/>
                 <arg value="-module-name"/>
                 <arg value="@{moduleName}"/>
+                <arg value="-Xallow-kotlin-package"/>
             </java>
 
             <javac2 srcdir="${toString:src.dirset}" destdir="@{output}" debug="true" debuglevel="lines,vars,source"
                     includeAntRuntime="false" source="${java.target}" target="${java.target}">
-                <skip pattern="kotlin/jvm/internal/.*"/>
+                <skip pattern="kotlin/Metadata"/>
                 <classpath>
                     <path refid="classpath.path"/>
                     <!-- Include @{output} here for Java compiler to resolve symbols from Kotlin sources -->
@@ -778,7 +903,7 @@
     </target>
 
     <target name="stdlib">
-        <new-kotlinc output="${output}/classes/stdlib" moduleName="kotlin-stdlib">
+        <new-kotlinc output="${output}/classes/stdlib" moduleName="kotlin-stdlib" additionalOptions="-Xmultifile-parts-inherit -Xdump-declarations-to ${output}/declarations/stdlib-declarations.json">
             <src>
                 <include name="libraries/stdlib/src"/>
             </src>
@@ -788,6 +913,26 @@
         </new-kotlinc>
     </target>
 
+    <target name="kotlin-test">
+        <new-kotlinc output="${output}/classes/kotlin-test" moduleName="kotlin-test">
+            <src>
+                <include name="libraries/kotlin.test/shared/src/main/kotlin" />
+                <include name="libraries/kotlin.test/shared/src/main/kotlin.jvm" />
+                <include name="libraries/kotlin.test/junit/src/main/kotlin" />
+            </src>
+            <class-path>
+                <pathelement path="${output}/classes/builtins"/>
+                <pathelement path="libraries/lib/junit-4.11.jar"/>
+            </class-path>
+        </new-kotlinc>
+
+        <pack-runtime-jar jar-name="kotlin-test.jar" implementation-title="${manifest.impl.title.kotlin.test}">
+            <jar-content>
+                <fileset dir="${output}/classes/kotlin-test" includes="**/*" excludes="kotlin/internal/OnlyInputTypes*,kotlin/internal/InlineOnly*,kotlin/internal"/>
+            </jar-content>
+        </pack-runtime-jar>
+    </target>
+
     <target name="core">
         <new-kotlinc output="${output}/classes/core" moduleName="kotlin-core">
             <src>
@@ -850,7 +995,6 @@
                 <fileset dir="${output}/classes/stdlib"/>
                 <zipfileset dir="${output}/builtins">
                     <include name="kotlin/**"/>
-                    <exclude name="kotlin/internal/**"/>
                     <!-- TODO: load metadata from @KotlinClass annotation in KotlinBuiltIns on JVM and restore this exclusion -->
                     <!-- exclude name="kotlin/reflect/**"/ -->
                 </zipfileset>
@@ -874,31 +1018,46 @@
         </jar>
 
         <delete file="${output}/kotlin-reflect-jarjar.jar" failonerror="false"/>
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="dependencies/jarjar.jar"/>
-        <jarjar jarfile="${output}/kotlin-reflect-jarjar.jar" filesonly="true" filesetmanifest="merge">
-            <zipfileset src="${output}/kotlin-reflect-before-jarjar.jar"/>
-            <rule pattern="org.jetbrains.kotlin.**" result="kotlin.reflect.jvm.internal.impl.@1"/>
-            <rule pattern="com.google.protobuf.**" result="kotlin.reflect.jvm.internal.impl.com.google.protobuf.@1"/>
-            <rule pattern="javax.inject.**" result="kotlin.reflect.jvm.internal.impl.javax.inject.@1"/>
-        </jarjar>
 
-        <kotlinc src="${basedir}/generators/infrastructure/strip-kotlin-annotations.kts" output="">
-            <compilerarg value="-script"/>
-            <compilerarg value="kotlin/jvm/internal/.*"/> <!-- Annotations to strip -->
-            <compilerarg value="kotlin/reflect/jvm/internal/impl/.*"/> <!-- Classes to strip from -->
-            <compilerarg value="${output}/kotlin-reflect-jarjar.jar"/>
-            <compilerarg value="${kotlin-home}/lib/kotlin-reflect.jar"/>
-            <classpath>
-                <pathelement location="${idea.sdk}/lib/asm-all.jar"/>
-            </classpath>
-        </kotlinc>
+        <sequential if:true="${obfuscate.reflect}">
+            <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="dependencies/jarjar.jar"/>
+            <jarjar jarfile="${output}/kotlin-reflect-jarjar.jar" filesonly="true" filesetmanifest="merge">
+                <zipfileset src="${output}/kotlin-reflect-before-jarjar.jar"/>
+                <rule pattern="org.jetbrains.kotlin.**" result="kotlin.reflect.jvm.internal.impl.@1"/>
+                <rule pattern="javax.inject.**" result="kotlin.reflect.jvm.internal.impl.javax.inject.@1"/>
+            </jarjar>
+
+            <kotlinc src="${basedir}/generators/infrastructure/strip-kotlin-annotations.kts" output="">
+                <compilerarg value="-version"/>
+                <compilerarg value="-script"/>
+                <compilerarg value="kotlin/Metadata"/> <!-- Annotation to strip -->
+                <compilerarg value="kotlin/reflect/jvm/internal/impl/.*"/> <!-- Classes to strip from -->
+                <compilerarg value="${output}/kotlin-reflect-jarjar.jar"/>
+                <compilerarg value="${kotlin-home}/lib/kotlin-reflect.jar"/>
+                <classpath>
+                    <pathelement location="${idea.sdk}/lib/asm-all.jar"/>
+                </classpath>
+            </kotlinc>
+        </sequential>
+
+        <sequential unless:true="${obfuscate.reflect}">
+            <echo message="Obfuscation of kotlin-reflect is disabled"/>
+            <copy file="${output}/kotlin-reflect-before-jarjar.jar" tofile="${output}/kotlin-reflect-jarjar.jar" overwrite="true"/>
+            <copy file="${output}/kotlin-reflect-before-jarjar.jar" tofile="${kotlin-home}/lib/kotlin-reflect.jar" overwrite="true"/>
+        </sequential>
     </target>
 
     <target name="pack-runtime-sources">
-
-        <!-- Rename packages in the sources of reflection impl (core) -->
         <delete dir="${output}/core.src" failonerror="false"/>
-        <copy todir="${output}/core.src/kotlin/reflect/jvm/internal/impl">
+
+        <local name="runtime.sources.base.dir"/>
+        <condition property="runtime.sources.base.dir"
+                   value="${output}/core.src/kotlin/reflect/jvm/internal/impl"
+                   else="${output}/core.src/org/jetbrains/kotlin">
+            <istrue value="${obfuscate.reflect}"/>
+        </condition>
+
+        <copy todir="${runtime.sources.base.dir}">
             <fileset dir="core">
                 <include name="descriptor.loader.java/src/**"/>
                 <include name="descriptors/src/**"/>
@@ -908,9 +1067,13 @@
             </fileset>
             <cutdirsmapper dirs="5"/> <!-- module/src/org/jetbrains/kotlin -->
         </copy>
-        <replaceregexp match="org\.jetbrains\.kotlin" replace="kotlin.reflect.jvm.internal.impl" flags="g">
-            <fileset dir="${output}/core.src"/>
-        </replaceregexp>
+
+        <sequential if:true="${obfuscate.reflect}">
+            <!-- Rename packages in the sources of reflection impl (core) -->
+            <replaceregexp match="org\.jetbrains\.kotlin" replace="kotlin.reflect.jvm.internal.impl" flags="g">
+                <fileset dir="${output}/core.src"/>
+            </replaceregexp>
+        </sequential>
 
         <pack-runtime-jar jar-name="kotlin-runtime-sources.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime.sources}">
             <jar-content>
@@ -933,14 +1096,14 @@
     </target>
 
     <target name="runtime"
-            depends="builtins,stdlib,core,reflection,pack-runtime,pack-runtime-sources"/>
+            depends="builtins,stdlib,kotlin-test,core,reflection,pack-runtime,pack-runtime-sources,mock-runtime-for-test"/>
 
     <target name="dist"
-            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin,kotlinr"
+            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,runtime,kotlin-js-stdlib,android-extensions-compiler,daemon-client,kotlin-build-common-test"
             description="Builds redistributables from sources"/>
 
     <target name="dist-quick"
-            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin"
+            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,runtime,kotlin-js-stdlib,android-extensions-compiler"
             description="Builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc"/>
 
     <target name="dist-quick-compiler-only"
@@ -955,75 +1118,6 @@
         </zip>
     </target>
 
-    <target name="kotlin-for-upsource">
-        <cleandir dir="${output}/classes/idea-analysis"/>
-
-        <javac2 destdir="${output}/classes/idea-analysis" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
-                source="${java.target}" target="${java.target}">
-            <withKotlin modulename="kotlin-for-upsource"/>
-            <skip pattern="kotlin/jvm/internal/.*"/>
-            <src>
-                <dirset dir="${basedir}/idea/ide-common" includes="src"/>
-                <dirset dir="${basedir}/idea/idea-analysis" includes="src"/>
-            </src>
-            <classpath>
-                <fileset dir="${idea.sdk}" includes="core-analysis/*.jar"/>
-                <pathelement location="${output}/kotlin-compiler-before-shrink.jar"/>
-                <path refid="classpath"/>
-            </classpath>
-        </javac2>
-
-        <copy todir="${output}/classes/idea-analysis">
-            <fileset dir="${basedir}/idea/idea-analysis/src" excludes="**/*.java, **/*.kt"/>
-        </copy>
-
-        <jar jarfile="${output}/kotlin-for-upsource0.jar">
-            <fileset dir="${output}/classes/idea-analysis"/>
-            <fileset dir="${output}/classes/compiler"/>
-            <fileset dir="${output}/builtins">
-                <include name="kotlin/**"/>
-                <exclude name="kotlin/internal/**"/>
-            </fileset>
-            <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="META-INF/services/**"/>
-            <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
-            <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
-            <fileset dir="${basedir}/compiler/cli/src" includes="META-INF/services/**"/>
-
-            <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
-            <zipgroupfileset file="${kotlin-home}/lib/kotlin-runtime.jar"/>
-            <zipgroupfileset file="${kotlin-home}/lib/kotlin-runtime-sources.jar"/>
-            <zipgroupfileset file="${kotlin-home}/lib/kotlin-reflect.jar"/>
-
-            <fileset dir="${basedir}/resources"/>
-            <!-- icons, etc. -->
-            <fileset dir="idea/resources"/>
-            <!-- plugin.xml and friends -->
-            <fileset dir="idea/src" includes="META-INF/**"/>
-        </jar>
-        <sleep seconds="1"/>
-        <jar jarfile="${output}/kotlin-for-upsource.jar">
-            <zipfileset src="${output}/kotlin-for-upsource0.jar">
-                <exclude name="javax/**/*.java"/>
-            </zipfileset>
-        </jar>
-        <delete file="${output}/kotlin-for-upsource0.jar"/>
-
-        <!-- sources -->
-        <jar jarfile="${output}/kotlin-for-upsource-sources.jar">
-            <zipfileset src="${output}/kotlin-compiler-sources.jar" includes="**/*"/>
-            <fileset dir="idea/idea-analysis/src"/>
-            <fileset dir="idea/ide-common/src"/>
-
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
-
-    </target>
-
     <target name="zip-test-data">
         <zip destfile="${output}/kotlin-test-data.zip">
             <zipfileset dir="compiler/testData" prefix="compiler"/>
@@ -1032,7 +1126,29 @@
         </zip>
     </target>
 
+    <target name="mock-runtime-for-test">
+        <delete dir="${output}/mock-runtime-src" failonerror="false"/>
+        <mkdir dir="${output}/mock-runtime-src"/>
+        <copy file="${basedir}/libraries/stdlib/src/kotlin/util/Standard.kt" todir="${output}/mock-runtime-src"/>
+        <copy file="${basedir}/libraries/stdlib/src/kotlin/internal/Annotations.kt" todir="${output}/mock-runtime-src"/>
+
+        <new-kotlinc output="${output}/classes/mock-runtime" moduleName="kotlin-stdlib">
+            <src>
+                <include name="dist/mock-runtime-src"/>
+            </src>
+            <class-path>
+                <pathelement path="${output}/classes/builtins"/>
+            </class-path>
+        </new-kotlinc>
+
+        <pack-runtime-jar jar-dir="${output}" jar-name="kotlin-mock-runtime-for-test.jar" implementation-title="Kotlin Mock Runtime">
+            <jar-content>
+                <fileset dir="${output}/classes/mock-runtime"/>
+            </jar-content>
+        </pack-runtime-jar>
+    </target>
+
     <target name="build-bootstrap-artifacts" depends="dist,zip-compiler"/>
 
-    <target name="build-artifacts" depends="dist,zip-compiler,kotlin-for-upsource,zip-test-data"/>
+    <target name="build-artifacts" depends="dist,zip-compiler,zip-test-data"/>
 </project>

compiler/android-tests/android-module/android-module.iml

@@ -1,43 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
-        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
-        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
-        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
-        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
-        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
-        <option name="APK_PATH" value="" />
-        <option name="LIBRARY_PROJECT" value="false" />
-        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
-        <option name="GENERATE_UNSIGNED_APK" value="false" />
-        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
-        <option name="PACK_TEST_CODE" value="false" />
-        <option name="RUN_PROGUARD" value="false" />
-        <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
-        <resOverlayFolders>
-          <path>/res-overlay</path>
-        </resOverlayFolders>
-        <includeSystemProguardFile>true</includeSystemProguardFile>
-        <includeAssetsFromLibraries>false</includeAssetsFromLibraries>
-        <additionalNativeLibs />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android 2.3.3 Platform" jdkType="Android SDK" />
+<module version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>

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

@@ -0,0 +1,74 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        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
+    }
+}
+apply plugin: 'com.android.application'
+
+repositories {
+    jcenter()
+}
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "23.0.3"
+
+    defaultConfig {
+        applicationId "org.jetbrains.kotlin.android.tests"
+        minSdkVersion 19
+        targetSdkVersion 19
+        versionCode 1
+        versionName "1.0"
+        testApplicationId "org.jetbrains.kotlin.android.tests.gradle"
+        testInstrumentationRunner "android.test.InstrumentationTestRunner"
+    }
+    buildTypes {
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java {
+                srcDirs = ['src']
+            }
+            res.srcDirs = ['res']
+        }
+        androidTest {
+            java {
+                srcDirs = ['src']
+            }
+        }
+    }
+    packagingOptions { exclude 'META-INF/build.txt' }
+
+    //TODO run under java 6, cause there is error on implicit 'stream' import in 'asWithMutable' test
+    lintOptions {
+        abortOnError false
+    }
+
+    compileOptions {
+        incremental = false
+    }
+
+    dexOptions {
+        dexInProcess false
+        javaMaxHeapSize "600m"
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile 'junit:junit:4.12'
+}

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

@@ -8,5 +8,5 @@
 # For customization when using a Version Control System, please read the
 # header note.
 #sdk.dir=compiler/android-tests/android-module/android-sdk/android-sdk-windows
-#sdk.dir.relative=android-sdk/android-sdk-windows
+sdk.dir=../../../android.tests.dependencies/android-sdk
 

compiler/android-tests/android-module/src/org/jetbrains/kotlin/android/tests/AbstractCodegenTestCaseOnAndroid.java

@@ -22,21 +22,13 @@ import java.lang.reflect.Method;
 
 public class AbstractCodegenTestCaseOnAndroid extends TestCase {
 
-    protected void invokeBoxMethod(String filePath, String expectedResult) throws Exception {
+    protected void invokeBoxMethod(Class clazz, String filePath, String expectedResult) throws Exception {
         try {
-            Class clazz;
-            String packageName = filePath.replaceAll("\\\\|-|\\.|/", "_");
-            clazz = Class.forName(packageName + "." + getPackageClassName(packageName));
-            Method method;
-            method = clazz.getMethod("box");
+            Method method = clazz.getMethod("box");
             assertEquals(expectedResult, method.invoke(null));
         }
         catch (Throwable e) {
             throw new RuntimeException("File: " + filePath, e);
         }
     }
-
-    public static String getPackageClassName(String packageName) {
-        return Character.toUpperCase(packageName.charAt(0)) + packageName.substring(1, packageName.length()) + "Package";
-    }
 }

compiler/android-tests/android-tests.iml

@@ -9,12 +9,13 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="compiler-tests" />
+    <orderEntry type="module" module-name="tests-common" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="library" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="generators" scope="TEST" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="descriptor.loader.java" scope="TEST" />
+    <orderEntry type="module" module-name="frontend.java" scope="TEST" />
   </component>
 </module>

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

@@ -19,25 +19,27 @@ package org.jetbrains.kotlin.android.tests;
 import com.intellij.util.PlatformUtils;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.jetbrains.annotations.NotNull;
 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;
 import org.jetbrains.kotlin.android.tests.run.PermissionManager;
 import org.junit.Assert;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class CodegenTestsOnAndroidRunner {
-    private static final Pattern ERROR_IN_TEST_OUTPUT_PATTERN =
-            Pattern.compile("([\\s]+at .*| Caused .*| java.lang.RuntimeException: File: .*|[\\s]+\\.\\.\\. .* more| Error in .*)");
-    private static final Pattern NUMBER_OF_TESTS_IF_FAILED = Pattern.compile("Tests run: ([0-9]*),  Failures: ([0-9]*),  Errors: ([0-9]*)");
-    private static final Pattern NUMBER_OF_TESTS_OK = Pattern.compile(" OK \\(([0-9]*) tests\\)");
 
     private final PathManager pathManager;
 
@@ -53,120 +55,22 @@ public class CodegenTestsOnAndroidRunner {
         TestSuite suite = new TestSuite("MySuite");
 
         String resultOutput = runTests();
-        if (resultOutput == null) return suite;
 
-        // Test name -> stackTrace
-        Map<String, String> resultMap = parseOutputForFailedTests(resultOutput);
-        final Statistics statistics;
-
-        // If map is empty => there are no failed tests
-        if (resultMap.isEmpty()) {
-            statistics = parseOutputForTestsNumberIfTestsPassed(resultOutput);
+        String reportFolder = pathManager.getTmpFolder() + "/build/outputs/androidTest-results/connected";
+        try {
+            List<TestCase> testCases = parseSingleReportInFolder(reportFolder);
+            for (TestCase aCase : testCases) {
+                suite.addTest(aCase);
+            }
+            Assert.assertNotEquals("There is no test results in report", 0, testCases.size());
         }
-        else {
-            statistics = parseOutputForTestsNumberIfThereIsFailedTests(resultOutput);
-
-            for (final Map.Entry<String, String> entry : resultMap.entrySet()) {
-
-                suite.addTest(new TestCase("run") {
-                    @Override
-                    public String getName() {
-                        return entry.getKey();
-                    }
-
-                    @Override
-                    protected void runTest() throws Throwable {
-                        Assert.fail(entry.getValue() + "See more information in log above.");
-                    }
-                });
-            }
+        catch (Exception e) {
+            throw new RuntimeException("Can't parse test results in " + reportFolder +"\n" + resultOutput);
         }
 
-        Assert.assertNotNull("Cannot parse number of failed tests from final line", statistics);
-        Assert.assertEquals("Number of stackTraces != failed tests on the final line", resultMap.size(),
-                            statistics.failed + statistics.errors);
-
-        suite.addTest(new TestCase("run") {
-            @Override
-            public String getName() {
-                return "testAll: Total: " + statistics.total + ", Failures: " + statistics.failed + ", Errors: " + statistics.errors;
-            }
-
-            @Override
-            protected void runTest() throws Throwable {
-                Assert.assertTrue(true);
-            }
-        });
-
         return suite;
     }
 
-
-    /*
-    Output example:
-    [exec] Error in testKt344:
-    [exec] java.lang.RuntimeException: File: compiler\testData\codegen\boxWithStdlib\regressions\kt344.kt
-    [exec] 	at org.jetbrains.kotlin.android.tests.AbstractCodegenTestCaseOnAndroid.invokeBoxMethod(AbstractCodegenTestCaseOnAndroid.java:38)
-    [exec] 	at org.jetbrains.kotlin.android.tests.CodegenTestCaseOnAndroid.testKt344(CodegenTestCaseOnAndroid.java:595)
-    [exec] 	at java.lang.reflect.Method.invokeNative(Native Method)
-    [exec] 	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:169)
-    [exec] Caused by: java.lang.reflect.InvocationTargetException
-    [exec] 	at java.lang.reflect.Method.invokeNative(Native Method)
-    [exec] 	at org.jetbrains.kotlin.android.tests.AbstractCodegenTestCaseOnAndroid.invokeBoxMethod(AbstractCodegenTestCaseOnAndroid.java:35)
-    [exec] 	... 13 more
-    [exec] Caused by: java.lang.VerifyError: compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage$t6$foo$1
-    [exec] 	at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.t6(dummy.kt:94)
-    [exec] 	at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.box(dummy.kt:185)
-    [exec] 	... 16 more
-    [exec] ...............
-    [exec] Error in testKt529:
-    */
-    private static Map<String, String> parseOutputForFailedTests(@NotNull String output) {
-        Map<String, String> result = new HashMap<String, String>();
-        StringBuilder builder = new StringBuilder();
-        String failedTestNamePrefix = " Error in ";
-        String lastFailedTestName = "";
-        Matcher matcher = ERROR_IN_TEST_OUTPUT_PATTERN.matcher(output);
-        while (matcher.find()) {
-            String groupValue = matcher.group();
-            if (groupValue.startsWith(failedTestNamePrefix)) {
-                if (builder.length() > 0) {
-                    result.put(lastFailedTestName, builder.toString());
-                    builder.delete(0, builder.length());
-                }
-                lastFailedTestName = groupValue.substring(failedTestNamePrefix.length());
-            }
-            builder.append(groupValue);
-            builder.append("\n");
-        }
-        if (builder.length() > 0) {
-            result.put(lastFailedTestName, builder.toString());
-        }
-        return result;
-    }
-
-    //[exec] Tests run: 225,  Failures: 0,  Errors: 2
-    @Nullable
-    private static Statistics parseOutputForTestsNumberIfThereIsFailedTests(String output) {
-        Matcher matcher = NUMBER_OF_TESTS_IF_FAILED.matcher(output);
-        if (matcher.find()) {
-            return new Statistics(Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)),
-                                  Integer.parseInt(matcher.group(3)));
-        }
-        return null;
-    }
-
-    //[exec] OK (223 tests)
-    @Nullable
-    private static Statistics parseOutputForTestsNumberIfTestsPassed(String output) {
-        Matcher matcher = NUMBER_OF_TESTS_OK.matcher(output);
-        if (matcher.find()) {
-            return new Statistics(Integer.parseInt(matcher.group(1)), 0, 0);
-        }
-        return null;
-    }
-
-
     @Nullable
     public String runTests() {
         File rootForAndroidDependencies = new File(pathManager.getDependenciesRoot());
@@ -175,27 +79,27 @@ public class CodegenTestsOnAndroidRunner {
         }
 
         SDKDownloader downloader = new SDKDownloader(pathManager);
-        Emulator emulator = new Emulator(pathManager);
-        AntRunner antRunner = new AntRunner(pathManager);
         downloader.downloadAll();
         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();
+        gradleRunner.build();
+
+        emulator.createEmulator();
 
         String platformPrefixProperty = System.setProperty(PlatformUtils.PLATFORM_PREFIX_KEY, "Idea");
-
         try {
-            PermissionManager.setPermissions(pathManager);
-
-            antRunner.packLibraries();
-
-            emulator.createEmulator();
             emulator.startEmulator();
 
             try {
                 emulator.waitEmulatorStart();
-                antRunner.cleanOutput();
-                antRunner.compileSources();
-                antRunner.installApplicationOnEmulator();
-                return antRunner.runTestsOnEmulator();
+                //runTestsViaAdb(emulator, gradleRunner);
+                return gradleRunner.connectedDebugAndroidTest();
             }
             catch (RuntimeException e) {
                 e.printStackTrace();
@@ -220,15 +124,55 @@ public class CodegenTestsOnAndroidRunner {
         }
     }
 
-    private static class Statistics {
-        public final int total;
-        public final int errors;
-        public final int failed;
+    private String runTestsViaAdb(Emulator emulator, GradleRunner gradleRunner) {
+        gradleRunner.installDebugAndroidTest();
+        String result = emulator.runTestsViaAdb();
+        System.out.println(result);
+        gradleRunner.uninstallDebugAndroidTest();
+        return result;
+    }
 
-        private Statistics(int total, int failed, int errors) {
-            this.total = total;
-            this.failed = failed;
-            this.errors = errors;
+    private static List<TestCase> parseSingleReportInFolder(String reportFolder) throws
+                                                                                 IOException,
+                                                                                 SAXException,
+                                                                                 ParserConfigurationException {
+        File folder = new File(reportFolder);
+        File[] files = folder.listFiles();
+        assert files != null;
+        assert files.length == 1;
+        File reportFile = files[0];
+
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+        Document doc = dBuilder.parse(reportFile);
+        Element root = doc.getDocumentElement();
+        NodeList testCases = root.getElementsByTagName("testcase");
+        List<TestCase> result = new ArrayList(testCases.getLength());
+
+        for (int i = 0; i < testCases.getLength(); i++) {
+            Element item = (Element) testCases.item(i);
+            final NodeList failure = item.getElementsByTagName("failure");
+            String name = item.getAttribute("name");
+            String clazz = item.getAttribute("classname");
+
+            if (failure.getLength() == 0) {
+                result.add(new TestCase(name) {
+                    @Override
+                    protected void runTest() throws Throwable {
+
+                    }
+                });
+            }
+            else {
+                result.add(new TestCase(name) {
+                    @Override
+                    protected void runTest() throws Throwable {
+                        Assert.fail(failure.item(0).getTextContent());
+                    }
+                });
+            }
         }
+
+        return result;
     }
 }