Prepare changelog for plugin update

KT-25733: Fix regression after optimization
#KT-25733 fixed (cherry picked from commit 07cc3bd63a)
2026-03-30 00:21:27 +00:00 · 2018-08-07 17:17:39 +03:00 · 2018-08-06 20:37:10 +03:00 · 2018-08-03 16:11:59 +03:00 · 2018-08-02 20:01:55 +03:00 · 2018-07-26 13:31:17 +03:00
68169 changed files with 1438007 additions and 3120759 deletions
--- a/.bunch
+++ b/.bunch
@@ -1,2 +1,8 @@
-202
-as42
+181
+173
+172_173
+as31_173
+as32
+182
+as33_as32
+as33c4_182
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,4 @@
 **/testData/** linguist-vendored
 *Generated.java linguist-generated=true
-* text=auto
-* eol=lf
-*.png binary
-*.jar binary
 compiler/cli/bin/* eol=lf
 compiler/cli/bin/*.bat eol=crlf
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,14 @@
+Many thanks for your contribution, we genuinely appreciate it. 
+Make sure that you can say "YES" to each point in this short checklist:
+
+  - You do not have merge commits in PR
+  - You made a few changes
+  - You provided the link to related issue from YouTrack
+  - You can describe changes made in PR
+  - You made changes related to only one issue
+  - You are ready to defend your changes on code review
+  - You didn't touch what you don't understand
+  - You ran the build locally, and verified new functionality
+  - You ran related tests locally, and it passed
+
+Thank you for your contribution!
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
 .DS_Store
 .idea/shelf
-/confluence/target
-/dependencies/repo
 /android.tests.dependencies
-/dependencies/android.tests.dependencies
+/confluence/target
+/dependencies
 /dist
 /local
 /gh-pages
@@ -16,9 +15,12 @@ workspace.xml
 *.versionsBackup
 /idea/testData/debugger/tinyApp/classes*
 /jps-plugin/testData/kannotator
+/ultimate/dependencies
+/ultimate/ideaSDK
+/ultimate/out
+/ultimate/tmp
 /js/js.translator/testData/out/
 /js/js.translator/testData/out-min/
-/js/js.translator/testData/out-pir/
 .gradle/
 build/
 !**/src/**/build
@@ -27,43 +29,12 @@ build/
 !**/testData/**/*.iml
 .idea/libraries/Gradle*.xml
 .idea/libraries/Maven*.xml
-.idea/artifacts/PILL_*.xml
-.idea/artifacts/KotlinPlugin.xml
+.idea/artifacts
 .idea/modules
 .idea/runConfigurations/JPS_*.xml
-.idea/runConfigurations/PILL_*.xml
-.idea/runConfigurations/_FP_*.xml
-.idea/runConfigurations/_MT_*.xml
 .idea/libraries
 .idea/modules.xml
 .idea/gradle.xml
 .idea/compiler.xml
 .idea/inspectionProfiles/profiles_settings.xml
 .idea/.name
-.idea/artifacts/dist_auto_*
-.idea/artifacts/dist.xml
-.idea/artifacts/ideaPlugin.xml
-.idea/artifacts/kotlinc.xml
-.idea/artifacts/kotlin_compiler_jar.xml
-.idea/artifacts/kotlin_plugin_jar.xml
-.idea/artifacts/kotlin_jps_plugin_jar.xml
-.idea/artifacts/kotlin_daemon_client_jar.xml
-.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
-.idea/artifacts/kotlin_main_kts_jar.xml
-.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml
-.idea/artifacts/kotlin_reflect_jar.xml
-.idea/artifacts/kotlin_stdlib_js_ir_*
-.idea/artifacts/kotlin_test_js_ir_*
-.idea/artifacts/kotlin_stdlib_wasm_*
-.idea/jarRepositories.xml
-.idea/csv-plugin.xml
-kotlin-ultimate/
-node_modules/
-.rpt2_cache/
-libraries/tools/kotlin-test-js-runner/lib/
-local.properties
-buildSrcTmp/
-distTmp/
-outTmp/
-/test.output
-/kotlin-native/dist
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AntConfiguration">
+    <buildFile url="file://$PROJECT_DIR$/libraries/build-docs.xml">
+      <maximumHeapSize value="1024" />
+    </buildFile>
+  </component>
+</project>
--- a/.idea/artifacts/dist_root.xml
+++ b/.idea/artifacts/dist_root.xml
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact build-on-make="true" name="dist_root">
-    <output-path>$PROJECT_DIR$/dist</output-path>
-    <root id="root">
-      <element id="artifact" artifact-name="dist" />
-    </root>
-  </artifact>
-</component>
--- a/.idea/artifacts/kotlinx_cli_jvm_1_5_255_SNAPSHOT.xml
+++ b/.idea/artifacts/kotlinx_cli_jvm_1_5_255_SNAPSHOT.xml
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="kotlinx.cli-jvm-1.5.255-SNAPSHOT">
-    <output-path>$PROJECT_DIR$/kotlin-native/endorsedLibraries/kotlinx.cli/build/libs</output-path>
-    <root id="archive" name="kotlinx.cli-jvm-1.5.255-SNAPSHOT.jar">
-      <element id="module-output" name="kotlin.kotlin-native.endorsedLibraries.kotlinx.cli.jvmMain" />
-    </root>
-  </artifact>
-</component>
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -63,6 +63,27 @@
      <option name="FOR_BRACE_FORCE" value="1" />
      <option name="FIELD_ANNOTATION_WRAP" value="0" />
    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+    </codeStyleSettings>
    <codeStyleSettings language="PROTO">
      <indentOptions>
        <option name="INDENT_SIZE" value="2" />
--- a/.idea/copyright/apache.xml
+++ b/.idea/copyright/apache.xml
@@ -1,7 +1,7 @@
 <component name="CopyrightManager">
  <copyright>
    <option name="allowReplaceRegexp" value="JetBrains" />
-    <option name="notice" value="Copyright 2010-&amp;#36;today.year JetBrains s.r.o. and Kotlin Programming Language contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
+    <option name="notice" value="Copyright 2010-&amp;#36;today.year JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license &#10;that can be found in the license/LICENSE.txt file." />
    <option name="myName" value="apache" />
  </copyright>
 </component>
--- a/.idea/dictionaries/4u7.xml
+++ b/.idea/dictionaries/4u7.xml
@@ -1,18 +1,8 @@
 <component name="ProjectDictionaryState">
  <dictionary name="4u7">
    <words>
-      <w>bintray</w>
-      <w>cacheability</w>
-      <w>cacheable</w>
      <w>cidr</w>
      <w>foldable</w>
-      <w>instrumentator</w>
-      <w>jdks</w>
-      <w>protobuf</w>
-      <w>redirector</w>
-      <w>remapper</w>
-      <w>sonatype</w>
-      <w>unpresent</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/dictionaries/Nikolay_Krasko.xml
+++ b/.idea/dictionaries/Nikolay_Krasko.xml
@@ -7,10 +7,9 @@
      <w>fqname</w>
      <w>goto</w>
      <w>gradle</w>
-      <w>infos</w>
      <w>intrinsics</w>
      <w>kdoc</w>
-      <w>lateinit</w>
+      <w>kompiler</w>
      <w>memoize</w>
      <w>memoized</w>
      <w>multiline</w>
@@ -19,15 +18,11 @@
      <w>preloader</w>
      <w>preloading</w>
      <w>preprocess</w>
-      <w>proximities</w>
      <w>redeclarations</w>
-      <w>reparsed</w>
      <w>smap</w>
      <w>subclassed</w>
      <w>subgraph</w>
      <w>substep</w>
-      <w>tailrec</w>
-      <w>typealias</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/dictionaries/dmitriy_dolovov.xml
+++ b/.idea/dictionaries/dmitriy_dolovov.xml
@@ -1,20 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="dmitriy.dolovov">
-    <words>
-      <w>cinterop</w>
-      <w>commonizable</w>
-      <w>commonization</w>
-      <w>commonize</w>
-      <w>commonized</w>
-      <w>commonizer</w>
-      <w>commonizers</w>
-      <w>commonizes</w>
-      <w>commonizing</w>
-      <w>interop</w>
-      <w>jetbrains</w>
-      <w>konan</w>
-      <w>kotlinx</w>
-      <w>macos</w>
-    </words>
-  </dictionary>
-</component>
--- a/.idea/dictionaries/dzharkov.xml
+++ b/.idea/dictionaries/dzharkov.xml
@@ -7,7 +7,6 @@
      <w>experimentality</w>
      <w>insn</w>
      <w>liveness</w>
-      <w>parameterless</w>
    </words>
  </dictionary>
-</component>
+</component>
--- a/.idea/dictionaries/sebastiansellmair.xml
+++ b/.idea/dictionaries/sebastiansellmair.xml
@@ -1,9 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="sebastiansellmair">
-    <words>
-      <w>cinterops</w>
-      <w>interops</w>
-      <w>klibrary</w>
-    </words>
-  </dictionary>
-</component>
--- a/.idea/dictionaries/sergey_igushkin.xml
+++ b/.idea/dictionaries/sergey_igushkin.xml
@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="sergey.igushkin">
-    <words>
-      <w>klib</w>
-    </words>
-  </dictionary>
-</component>
--- a/.idea/dictionaries/skuzmich.xml
+++ b/.idea/dictionaries/skuzmich.xml
@@ -1,9 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="skuzmich">
-    <words>
-      <w>anyref</w>
-      <w>ushr</w>
-      <w>wasm</w>
-    </words>
-  </dictionary>
-</component>
--- a/.idea/dictionaries/svyatoslav_kuzmich.xml
+++ b/.idea/dictionaries/svyatoslav_kuzmich.xml
@@ -1,27 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="svyatoslav.kuzmich">
-    <words>
-      <w>anyfunc</w>
-      <w>copysign</w>
-      <w>eqref</w>
-      <w>exnref</w>
-      <w>externref</w>
-      <w>funcref</w>
-      <w>jetbrains</w>
-      <w>kotlinx</w>
-      <w>ktor</w>
-      <w>optref</w>
-      <w>popcnt</w>
-      <w>rotl</w>
-      <w>rotr</w>
-      <w>simd</w>
-      <w>sqrt</w>
-      <w>testsuite</w>
-      <w>uninstantiable</w>
-      <w>unlinkable</w>
-      <w>vtable</w>
-      <w>wabt</w>
-      <w>xopt</w>
-    </words>
-  </dictionary>
-</component>
--- a/.idea/dictionaries/yan.xml
+++ b/.idea/dictionaries/yan.xml
@@ -3,23 +3,11 @@
    <words>
      <w>debuggee</w>
      <w>deserializes</w>
-      <w>destructured</w>
-      <w>hacky</w>
      <w>impls</w>
-      <w>inlined</w>
      <w>kapt</w>
-      <w>kotlinc</w>
-      <w>mutators</w>
-      <w>parcelable</w>
      <w>parceler</w>
-      <w>parcelers</w>
-      <w>parcelize</w>
      <w>repl</w>
-      <w>testdata</w>
      <w>uast</w>
-      <w>unbox</w>
-      <w>unboxed</w>
-      <w>unmute</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
    <file url="file://$PROJECT_DIR$/libraries" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/examples/browser-example" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/examples/browser-example-with-library" charset="UTF-8" />
@@ -14,7 +14,6 @@
    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-plugin" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-plugin-test" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-sam-with-receiver" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-serialization" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-osgi-bundle" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/maven-archetypes" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/maven-archetypes/kotlin-archetype-js" charset="UTF-8" />
--- a/.idea/icon.png
+++ b/.idea/icon.png
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -21,6 +21,7 @@
    </inspection_tool>
    <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="BusyWait" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CStyleArrayDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="CastConflictsWithInstanceof" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="CastToIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ChainedEquality" enabled="false" level="WARNING" enabled_by_default="true" />
@@ -54,6 +55,9 @@
    <inspection_tool class="DoubleCheckedLocking" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="ignoreOnVolatileVariables" value="true" />
    </inspection_tool>
+    <inspection_tool class="DuplicateCondition" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreSideEffectConditions" value="true" />
+    </inspection_tool>
    <inspection_tool class="EmptyStatementBody" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="m_reportEmptyBlocks" value="false" />
    </inspection_tool>
@@ -75,7 +79,6 @@
      <option name="m_ignoreLoopsWithoutConditions" value="false" />
    </inspection_tool>
    <inspection_tool class="ForLoopThatDoesntUseLoopVariable" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="GrPackage" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="myValues">
        <value>
@@ -98,9 +101,22 @@
    <inspection_tool class="IncompatibleAPI" enabled="true" level="ERROR" enabled_by_default="true">
      <option name="problems">
        <list>
-          <Problem reference="com.intellij.util.JdomKt#element" reason="Removed in 191" />
-          <Problem reference="org.jetbrains.kotlin.idea.reporter.ITNReporterCompat#submit" reason="parentComponent is nullable in AS" />
-          <Problem reference="com.intellij.diagnostic.ITNReporter#submit" reason="parentComponent is nullable in AS" />
+          <Problem reference="org.jetbrains.plugins.gradle.util.GradleConstants#KOTLIN_DSL_SCRIPT_EXTENSION" reason="Absent in 172. Please inline." />
+          <Problem reference="com.intellij.psi.impl.compiled.ClsClassImpl#getQualifiedName" reason="Nullable in 173, platform in 172. Use qualifiedNameEx instead." />
+          <Problem reference="com.intellij.internal.statistic.utils.StatisticsUtilKt#getEnumUsage" reason="Absent in 172. Use org.jetbrains.kotlin.idea.util.compat.statistic.StatisticKt.getEnumUsage instead." />
+          <Problem reference="com.intellij.internal.statistic.utils.StatisticsUtilKt#getBooleanUsage" reason="Absent in 172 Use org.jetbrains.kotlin.idea.util.compat.statistic.StatisticKt.getBooleanUsage instead." />
+          <Problem reference="com.intellij.internal.statistic.AbstractProjectsUsagesCollector" reason="Absent in 172. Use org.jetbrains.kotlin.idea.util.compat.statistic.AbstractProjectsUsagesCollector instead." />
+          <Problem reference="com.intellij.openapi.progress.ProgressManager#getProgressIndicator" reason="Not null starting from 181. Use getProgressIndicatorNullable instead." />
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#createModuleAt" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#doCreateRealModuleIn" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.openapi.progress.ProgressManager#getProgressIndicator" reason="Nullable in 181. Temporary use progressIndicatorNullable instead." />
+          <Problem reference="com.intellij.testFramework.fixtures.CodeInsightTestFixture#getProjectDisposable" reason="Method was introduced in 173 and absent in 172. Use getProjectDisposableEx instead. (95eaf81e0ea497f8c69263c11fd3202d28a7a1b2)" />
+          <Problem reference="org.jetbrains.org.objectweb.asm.Opcodes#V9" reason="Absent in 172 branch. Use V1_9 while 172 is supported." />
+          <Problem reference="com.intellij.psi.codeStyle.CommonCodeStyleSettings#getSoftMargins" reason="Absent in 172." />
+          <Problem reference="com.intellij.util.xmlb.XmlSerializer#serializeInto(java.lang.Object, org.jdom.Element)" reason="Absent in 172." />
+          <Problem reference="org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler#addSpace" reason="Method was replaced with outher methods in 182. Use addSpaceEx instead." />
+          <Problem reference="com.intellij.psi.util.PsiUtil#canBeOverridden" reason="Absent in 172. Use org.jetbrains.kotlin.idea.core.util.compat.psi.canBeOverridden() instead." />
+          <Problem reference="com.intellij.psi.util.PsiTreeUtilKt#parentOfType(com.intellij.psi.PsiElement)" reason="Absent in 172. Use org.jetbrains.kotlin.psi.psiUtil.getParentOfType instead." />
        </list>
      </option>
    </inspection_tool>
@@ -253,10 +269,6 @@
      <option name="ignoreObjectMethods" value="true" />
      <option name="ignoreAnonymousClassMethods" value="false" />
    </inspection_tool>
-    <inspection_tool class="MissingRecentApi" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="sinceBuildString" value="183.3284" />
-      <option name="untilBuildString" value="192.SNAPSHOT" />
-    </inspection_tool>
    <inspection_tool class="MisspelledCompareTo" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="MisspelledEquals" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="MisspelledHashcode" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -285,8 +297,15 @@
    <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="PackageName" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="namePattern" value="[a-z_][a-z\d_]*(\.[a-z_][a-zA-Z\d_]*)*" />
+    <inspection_tool class="ProblematicAPIUsage" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="problems">
+        <list>
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#createModuleAt" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#doCreateRealModuleIn" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.openapi.progress.ProgressManager#getProgressIndicator" reason="Nullable in 181. Temporary use progressIndicatorNullable instead." />
+          <Problem reference="com.intellij.testFramework.fixtures.CodeInsightTestFixture#getProjectDisposable" reason="Method was introduced in 173 and absent in 172. Use getProjectDisposableEx instead. (95eaf81e0ea497f8c69263c11fd3202d28a7a1b2)" />
+        </list>
+      </option>
    </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" />
@@ -303,11 +322,16 @@
    </inspection_tool>
    <inspection_tool class="SSBasedInspection" enabled="true" level="WARNING" enabled_by_default="true">
      <searchConfiguration name="SwingUtilities.invokeLater" text="SwingUtilities.invokeLater($runnable$)" recursive="false" caseInsensitive="false" type="JAVA">
+        <constraint name="Instance" regexp="SwingUtilities" minCount="0" target="true" within="" contains="" />
+        <constraint name="MethodCall" within="" contains="" />
+        <constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
        <constraint name="__context__" within="" contains="" />
        <constraint name="runnable" within="" contains="" />
      </searchConfiguration>
      <replaceConfiguration name="DirectCallOfDispose" text="$Instance$.dispose()" recursive="false" caseInsensitive="false" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="Disposer.dispose($Instance$)">
        <constraint name="Instance" regexp="super" nameOfExprType="Disposable" withinHierarchy="true" exprTypeWithinHierarchy="true" minCount="0" negateName="true" within="" contains="" />
+        <constraint name="MethodCall" target="true" within="" contains="" />
+        <constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
        <constraint name="__context__" within="" contains="" />
      </replaceConfiguration>
      <replaceConfiguration name="new Object[0]" text="new Object[0]" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.EMPTY_OBJECT_ARRAY" />
@@ -371,7 +395,6 @@
    </inspection_tool>
    <inspection_tool class="StringEquality" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="StringEqualsEmptyString" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="StringOperationCanBeSimplifiedMerged" />
    <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="SynchronizeOnThis" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true">
@@ -423,21 +446,6 @@
    <inspection_tool class="UnnecessaryLabelOnContinueStatement" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="UnnecessaryUnboxing" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnstableApiUsage" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="unstableApiAnnotations">
-        <set>
-          <option value="com.google.common.annotations.Beta" />
-          <option value="io.reactivex.annotations.Beta" />
-          <option value="io.reactivex.annotations.Experimental" />
-          <option value="org.apache.http.annotation.Beta" />
-          <option value="org.jetbrains.annotations.ApiStatus.Experimental" />
-          <option value="org.jetbrains.annotations.ApiStatus.Internal" />
-          <option value="org.jetbrains.annotations.ApiStatus.ScheduledForRemoval" />
-          <option value="rx.annotations.Beta" />
-          <option value="rx.annotations.Experimental" />
-        </set>
-      </option>
-    </inspection_tool>
    <inspection_tool class="UseOfPropertiesAsHashtable" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="VolatileLongOrDoubleField" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -453,4 +461,4 @@
      <option name="ignoreNonEmtpyLoops" value="false" />
    </inspection_tool>
  </profile>
-</component>
+</component>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
  <settings>
    <option name="PROJECT_PROFILE" value="idea.default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
    <version value="1.0" />
  </settings>
 </component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,29 +6,48 @@
    </properties>
  </component>
  <component name="EntryPointsManager">
-    <list size="3">
+    <list size="1">
      <item index="0" class="java.lang.String" itemvalue="javax.inject.Inject" />
-      <item index="1" class="java.lang.String" itemvalue="org.gradle.api.tasks.TaskAction" />
-      <item index="2" class="java.lang.String" itemvalue="org.gradle.api.tasks.options.Option" />
    </list>
  </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
+  <component name="FacetAutodetectingManager">
+    <autodetection-disabled>
+      <facet-type id="Python">
+        <modules>
+          <module name="Jet" />
+        </modules>
+      </facet-type>
+    </autodetection-disabled>
  </component>
  <component name="IdProvider" IDEtalkID="71A301FF1940049D6D82F12C40F1E1D5" />
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="true" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="true" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
    <option name="OTHER_OPTIONS" value="" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/libraries/pom.xml" />
+      </list>
+    </option>
  </component>
  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
-    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
    <option name="myNullables">
      <value>
-        <list size="14">
+        <list size="9">
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -38,17 +57,12 @@
          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-          <item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
-          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
-          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
-          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
-          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
        </list>
      </value>
    </option>
    <option name="myNotNulls">
      <value>
-        <list size="14">
+        <list size="9">
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
          <item index="2" class="java.lang.String" itemvalue="javax.validation.constraints.NotNull" />
@@ -58,11 +72,6 @@
          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-          <item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
-          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
-          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
-          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
-          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
        </list>
      </value>
    </option>
@@ -70,12 +79,9 @@
  <component name="ProjectResources">
    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
-  <component name="PsiViewerSettings">
-    <option name="splitDividerLocation" value="35" />
-  </component>
  <component name="SuppressABINotification">
    <option name="modulesWithSuppressedNotConfigured">
      <set>
@@ -92,7 +98,4 @@
    <option name="autoscroll" value="false" />
    <option name="showOnlyWarnings" value="false" />
  </component>
-  <component name="intellij-api-watcher-check-current-project">
-    <option name="shouldCheckCurrentProject" value="true" />
-  </component>
 </project>
--- a/.idea/runConfigurations/Generate_All_Tests.xml
+++ b/.idea/runConfigurations/Generate_All_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate All Tests" type="GradleRunConfiguration" factoryName="Gradle" folderName="Generators">
+  <configuration default="false" name="Generate All Tests" type="GradleRunConfiguration" factoryName="Gradle">
    <ExternalSystemSettings>
      <option name="executionName" />
      <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
    </ExternalSystemSettings>
    <method />
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/Generate_Compiler_Tests.xml
+++ b/.idea/runConfigurations/Generate_Compiler_Tests.xml
@@ -10,9 +10,8 @@
      </option>
      <option name="taskNames">
        <list>
-          <option value=":compiler:tests-for-compiler-generator:generateTests" />
+          <option value=":compiler:generateTests" />
          <option value=":compiler:tests-java8:generateTests" />
-          <option value=":compiler:tests-against-klib:generateTests" />
          <option value=":js:js.tests:generateTests" />
          <option value=":core:descriptors.runtime:generateTests" />
        </list>
@@ -22,4 +21,4 @@
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <method />
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/Generate_FIR_Checker_Components_and_FIR_IDE_Diagnostics.xml
+++ b/.idea/runConfigurations/Generate_FIR_Checker_Components_and_FIR_IDE_Diagnostics.xml
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate FIR Checker Components and FIR/IDE Diagnostics" type="GradleRunConfiguration" factoryName="Gradle" folderName="Generators">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":compiler:fir:checkers:generateCheckersComponents" />
-          <option value=":idea:idea-frontend-fir:generateCode" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/Generate_FIR_tree.xml
+++ b/.idea/runConfigurations/Generate_FIR_tree.xml
@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate FIR tree" type="GradleRunConfiguration" factoryName="Gradle" folderName="Generators">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$/compiler/fir/tree" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="generateTree" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/Generate_standard_library_sources.xml
+++ b/.idea/runConfigurations/Generate_standard_library_sources.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate standard library sources" type="GradleRunConfiguration" factoryName="Gradle" folderName="Stdlib">
+  <configuration default="false" name="Generate standard library sources" type="GradleRunConfiguration" factoryName="Gradle">
    <ExternalSystemSettings>
      <option name="executionName" />
      <option name="externalProjectPath" value="$PROJECT_DIR$/libraries/tools/kotlin-stdlib-gen" />
@@ -17,4 +17,4 @@
    </ExternalSystemSettings>
    <method />
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA" type="GradleRunConfiguration" factoryName="Gradle" singleton="true" folderName="IDEA">
+  <configuration default="false" name="IDEA" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
    <ExternalSystemSettings>
      <option name="executionName" />
      <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
    </ExternalSystemSettings>
    <method />
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/IDEA_Ultimate.xml
+++ b/.idea/runConfigurations/IDEA_Ultimate.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA Ultimate" type="GradleRunConfiguration" factoryName="Gradle" folderName="IDEA">
+  <configuration default="false" name="IDEA Ultimate" type="GradleRunConfiguration" factoryName="Gradle">
    <ExternalSystemSettings>
      <option name="executionName" />
      <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
    </ExternalSystemSettings>
    <method />
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/IDEA_Ultimate__No_ProcessCanceledException__.xml
+++ b/.idea/runConfigurations/IDEA_Ultimate__No_ProcessCanceledException__.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA Ultimate (No ProcessCanceledException) " type="GradleRunConfiguration" factoryName="Gradle" folderName="IDEA">
+  <configuration default="false" name="IDEA Ultimate (No ProcessCanceledException) " type="GradleRunConfiguration" factoryName="Gradle">
    <ExternalSystemSettings>
      <option name="executionName" />
      <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
    </ExternalSystemSettings>
    <method />
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
+++ b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="GradleRunConfiguration" factoryName="Gradle" folderName="IDEA">
+  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="GradleRunConfiguration" factoryName="Gradle">
    <ExternalSystemSettings>
      <option name="executionName" />
      <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
    </ExternalSystemSettings>
    <method />
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/IDEA__Not_Internal_.xml
+++ b/.idea/runConfigurations/IDEA__Not_Internal_.xml
@@ -1,19 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA (Not Internal)" type="GradleRunConfiguration" factoryName="Gradle" folderName="IDEA">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-Pidea.is.internal=false" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="runIde" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/Test__Commonizer.xml
+++ b/.idea/runConfigurations/Test__Commonizer.xml
@@ -1,25 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test: Commonizer" type="GradleRunConfiguration" factoryName="Gradle" folderName="Tests">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--tests &quot;org.jetbrains.kotlin.gradle.CommonizerHierarchicalIT&quot; --tests &quot;org.jetbrains.kotlin.gradle.CommonizerIT&quot; --tests &quot;org.jetbrains.kotlin.commonizer.**&quot;" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":native:kotlin-klib-commonizer-api:test" />
-          <option value=":native:kotlin-klib-commonizer:test" />
-          <option value=":kotlin-gradle-plugin-integration-tests:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/Test__KMM.xml
+++ b/.idea/runConfigurations/Test__KMM.xml
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test: KMM" type="GradleRunConfiguration" factoryName="Gradle" folderName="Tests">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="kmmTest" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <method v="2" />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml
+++ b/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test: public API binary compatibility validator, overwrite results" type="GradleRunConfiguration" factoryName="Gradle" folderName="Stdlib">
+  <configuration default="false" name="Test: public API binary compatibility validator, overwrite results" type="GradleRunConfiguration" factoryName="Gradle">
    <ExternalSystemSettings>
      <option name="executionName" />
      <option name="externalProjectPath" value="$PROJECT_DIR$/libraries/tools/binary-compatibility-validator" />
@@ -18,4 +18,4 @@
    </ExternalSystemSettings>
    <method />
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/Test__stdlib_js_public_kotlin_api_test__overwrite_results.xml
+++ b/.idea/runConfigurations/Test__stdlib_js_public_kotlin_api_test__overwrite_results.xml
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test: stdlib-js public kotlin api test, overwrite results" type="GradleRunConfiguration" factoryName="Gradle" folderName="Stdlib">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--tests &quot;org.jetbrains.kotlin.js.test.ApiTest&quot; -Poverwrite.output=true --parallel" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":js:js.tests:cleanTest" />
-          <option value=":js:js.tests:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>false</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/run_IR_test_in_node_js.xml
+++ b/.idea/runConfigurations/run_IR_test_in_node_js.xml
@@ -1,13 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="run IR test in node.js" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/js/js.translator/testData/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="runIrTestInNode" />
-    </scripts>
-    <arguments value="$FilePath$" />
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
--- a/.idea/scopes/Apply_copyright.xml
+++ b/.idea/scopes/Apply_copyright.xml
@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="Apply copyright" pattern="!file[*]:*//testData//*&amp;&amp;!file[*]:testData//*&amp;&amp;!file[*]:*.gradle.kts&amp;&amp;!file[*]:*.gradle&amp;&amp;!file[group:kotlin-ultimate]:*/&amp;&amp;!file[kotlin.libraries]:stdlib/api//*" />
+  <scope name="Apply copyright" pattern="!file[*]:*//testData//*&amp;&amp;!file[*]:testData//*&amp;&amp;!file[*]:*.gradle.kts&amp;&amp;!file[*]:*.gradle" />
 </component>
--- a/.idea/upsource.xml
+++ b/.idea/upsource.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UpsourceSharedProjectSettings">
-    <option name="upsourceUrl" value="https://upsource.jetbrains.com/" />
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CommitMessageInspectionProfile">
-    <profile version="1.0">
-      <inspection_tool class="BodyLimit" enabled="true" level="WARNING" enabled_by_default="true" />
-      <inspection_tool class="GrazieCommit" enabled="true" level="TYPO" enabled_by_default="true" />
-      <inspection_tool class="SubjectBodySeparation" enabled="true" level="WARNING" enabled_by_default="true" />
-      <inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true" />
-    </profile>
-  </component>
  <component name="IssueNavigationConfiguration">
    <option name="links">
      <list>
@@ -33,4 +25,5 @@
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
  </component>
-</project>
+</project>
+
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,4 +0,0 @@
-## Code of Conduct
-
-This project and the corresponding community is governed by the [JetBrains Open Source and Community Code of Conduct](https://confluence.jetbrains.com/display/ALL/JetBrains+Open+Source+and+Community+Code+of+Conduct). Please make sure you read it. 
-
--- a/ChangeLog.md
+++ b/ChangeLog.md
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,38 +1,24 @@
-[![official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
-[![TeamCity (simple build status)](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/Kotlin_KotlinPublic_Compiler.svg)](https://teamcity.jetbrains.com/buildConfiguration/Kotlin_KotlinPublic_Compiler?branch=%3Cdefault%3E&buildTypeTab=overview&mode=builds)
-[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlin/kotlin-maven-plugin.svg)](https://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)](https://www.apache.org/licenses/LICENSE-2.0)
-[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.jetbrains.com/scans?search.rootProjectNames=Kotlin)
+[![official project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+<a href="http://slack.kotlinlang.org/"><img src="http://slack.kotlinlang.org/badge.svg" height="20"></a>
+[![TeamCity (simple build status)](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/Kotlin_dev_Compiler.svg)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_dev_Compiler&branch_Kotlin_dev=%3Cdefault%3E&tab=buildTypeStatusDiv)
+[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlin/kotlin-maven-plugin.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.jetbrains.kotlin%22)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)

 # Kotlin Programming Language

-Welcome to [Kotlin](https://kotlinlang.org/)!   
-It is an open-source, statically typed programming language supported and developed by [JetBrains](https://www.jetbrains.com/) and open-source contributors.
-
-Some handy links:
+Welcome to [Kotlin](https://kotlinlang.org/)! Some handy links:

 * [Kotlin Site](https://kotlinlang.org/)
 * [Getting Started Guide](https://kotlinlang.org/docs/tutorials/getting-started.html)
- * [Try Kotlin](https://play.kotlinlang.org/)
+ * [Try Kotlin](https://try.kotlinlang.org/)
 * [Kotlin Standard Library](https://kotlinlang.org/api/latest/jvm/stdlib/index.html)
 * [Issue Tracker](https://youtrack.jetbrains.com/issues/KT)
 * [Forum](https://discuss.kotlinlang.org/)
 * [Kotlin Blog](https://blog.jetbrains.com/kotlin/)
- * [Subscribe to Kotlin YouTube channel](https://www.youtube.com/channel/UCP7uiEZIqci43m22KDl0sNw)
 * [Follow Kotlin on Twitter](https://twitter.com/kotlin)
- * [Public Slack channel](https://slack.kotlinlang.org/)
+ * [Public Slack channel](http://slack.kotlinlang.org/)
 * [TeamCity CI build](https://teamcity.jetbrains.com/project.html?tab=projectOverview&projectId=Kotlin)

-## Kotlin Multiplatform capabilities
-
-Support for multiplatform programming is one of Kotlin’s key benefits. It reduces time spent writing and maintaining the same code for [different platforms](https://kotlinlang.org/docs/reference/mpp-supported-platforms.html) while retaining the flexibility and benefits of native programming.
-
- * [Kotlin Multiplatform Mobile](https://kotlinlang.org/lp/mobile/) for sharing code between Android and iOS
- * [Getting Started with Kotlin Multiplatform Mobile Guide](https://kotlinlang.org/docs/mobile/create-first-app.html)
- * [Kotlin Multiplatform Benefits](https://kotlinlang.org/docs/reference/multiplatform.html)
- * [Share code on all platforms](https://kotlinlang.org/docs/reference/mpp-share-on-platforms.html#share-code-on-all-platforms)
- * [Share code on similar platforms](https://kotlinlang.org/docs/reference/mpp-share-on-platforms.html#share-code-on-similar-platforms)
-
 ## Editing Kotlin

 * [Kotlin IntelliJ IDEA Plugin](https://kotlinlang.org/docs/tutorials/getting-started.html)
@@ -52,20 +38,11 @@ In order to build Kotlin distribution you need to have:
        JDK_18="path to JDK 1.8"
        JDK_9="path to JDK 9"

-For local development, if you're not working on bytecode generation or the standard library, it's OK to have only JDK 1.8 and JDK 9 installed, and to point `JDK_16` and `JDK_17` environment variables to your JDK 1.8 installation.
+For local development, if you're not working on bytecode generation or the standard library, it's OK to have only JDK 1.8 and JDK 9 installed, and to point JDK_16 and JDK_17 environment variables to your JDK 1.8 installation.

-You also can use [Gradle properties](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties) to setup `JDK_*` variables.
+You also can use [Gradle properties](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_properties_and_system_properties) to setup JDK_* variables.

-Note: The JDK 6 for MacOS is not available on Oracle's site. You can install it by
-
-```bash
-$ brew tap homebrew/cask-versions
-$ brew install --cask java6
-```
-
-On Windows you might need to add long paths setting to the repo:
-
-    git config core.longpaths true 
+> Note: The JDK 6 for MacOS is not available on Oracle's site. You can [download it here](https://support.apple.com/kb/DL1572). 

 ## Building

@@ -93,7 +70,7 @@ command line parameters on the first run:

 - `clean` - clean build results
 - `dist` - assembles the compiler distribution into `dist/kotlinc/` folder
- `ideaPlugin` - assembles the Kotlin IDEA plugin distribution into `dist/artifacts/ideaPlugin/Kotlin/` folder
+- `ideaPlugin` - assembles the Kotlin IDEA plugin distribution into `dist/artifacts/Kotlin` folder
 - `install` - build and install all public artifacts into local maven repository
 - `runIde` - build IDEA plugin and run IDEA with it
 - `coreLibsTest` - build and run stdlib, reflect and kotlin-test tests
@@ -101,77 +78,92 @@ command line parameters on the first run:
 - `compilerTest` - build and run all compiler tests
 - `ideaPluginTest` - build and run all IDEA plugin tests

-To reproduce TeamCity build use `-Pteamcity=true` flag. Local builds don't run proguard and have jar compression disabled by default.
-
 **OPTIONAL:** Some artifacts, mainly Maven plugin ones, are built separately with Maven.
 Refer to [libraries/ReadMe.md](libraries/ReadMe.md) for details.

-To build Kotlin/Native, see
-[kotlin-native/README.md](kotlin-native/README.md#building-from-source).

 ### Building for different versions of IntelliJ IDEA and Android Studio

-Kotlin plugin is intended to work with several recent versions of IntelliJ IDEA and Android Studio. Each platform is allowed to have a different set of features and might provide a slightly different API. Instead of using several parallel Git branches, the project stores everything in a single branch, but files may have counterparts with version extensions (\*.as32, \*.172, \*.181). The primary file is expected to be replaced with its counterpart when targeting a non-default platform.
+Kotlin plugin is indented to work with several recent versions of IntelliJ IDEA and Android Studio. Each platform is allowed to have a different set of features and might provide a slightly different API. Instead of using several parallel Git branches, project stores everything in a single branch, but files may have counterparts with version extensions (\*.as32, \*.172, \*.181). The primary file is expected to be replaced with its counterpart when targeting non-default platform.

-A More detailed description of this scheme can be found at https://github.com/JetBrains/bunches/blob/master/ReadMe.md.
+More detailed description of this scheme can be found at https://github.com/JetBrains/bunches/blob/master/ReadMe.md.

 Usually, there's no need to care about multiple platforms as all features are enabled everywhere by default. Additional counterparts should be created if there's an expected difference in behavior or an incompatible API usage is required **and** there's no reasonable workaround to save source compatibility. Kotlin plugin contains a pre-commit check that shows a warning if a file has been updated without its counterparts.

-Development for some particular platform is possible after 'switching' that can be done with the [Bunch Tool](https://github.com/JetBrains/bunches/releases) from the command line.
+Development for some particular platform is possible after 'switching' that can be done with [Bunch Tool](https://github.com/JetBrains/bunches/releases) from the command line.

 ```sh
 cd kotlin-project-dir

-# switching to IntelliJ Idea 2019.1
-bunch switch 191
+# switching to IntelliJ Idea 2018.2
+bunch switch . 182
 ```

 ## <a name="working-in-idea"></a> Working with the project in IntelliJ IDEA

-Working with the Kotlin project requires at least IntelliJ IDEA 2019.1. You can download IntelliJ IDEA 2019.1 [here](https://www.jetbrains.com/idea/download).
+Working with the Kotlin project requires IntelliJ IDEA 2017.3. You can download IntelliJ IDEA 2017.3 [here](https://www.jetbrains.com/idea/download).

-After cloning the project, to import the project in IntelliJ choose the project directory in the Open project dialog. Then, after project opened, select 
-`File` -> `New` -> `Module from Existing Sources...` in the menu, and select `build.gradle.kts` file in the project's root folder.
+To import the project in Intellij choose project directory in Open project dialog. Then, after project opened, Select 
+`File` -> `New...` -> `Module from Existing Sources` in the menu, and select `build.gradle.kts` file in the project's root folder.

 In the import dialog, select `use default gradle wrapper`.

-To be able to run tests from IntelliJ easily, check `Delegate IDE build/run actions to Gradle` and choose `Gradle Test Runner` in the Gradle runner settings after importing the project.
+To be able to run tests from IntelliJ easily, check `Delegate IDE build/run actions to Gradle` and choose `Gradle Test Runner` in the Gradle runner settings.

-At this time, you can use the latest released `1.3.x` version of the Kotlin plugin for working with the code. To make sure you have the latest version installed, use `Tools` -> `Kotlin` -> `Configure Kotlin Plugin Updates`.
+At this time, you can use the latest released 1.2.x version of the Kotlin plugin for working with the code. To make sure you have the latest version installed, use Tools | Kotlin | Configure Kotlin Plugin Updates and press "Check for updates now".

 ### Compiling and running

-From this root project there are Run/Debug Configurations for running `IDEA` or the `Generate Compiler Tests` for example; so if you want to try out the latest and greatest IDEA plugin
+From this root project there are Run/Debug Configurations for running IDEA or the Compiler Tests for example; so if you want to try out the latest and greatest IDEA plugin

-* `VCS` -> `Git` -> `Pull`
-* Run the `IDEA` run configuration in the project
-* A child IntelliJ IDEA with the Kotlin plugin will then startup
+* VCS -> Git -> Pull
+* Run the "IDEA" run configuration in the project
+* a child IntelliJ IDEA with the Kotlin plugin will then startup

-### Dependency verification
+### Including into composite build

-We have a [dependencies verification](https://docs.gradle.org/current/userguide/dependency_verification.html) feature enabled in the
-repository for all Gradle builds. Gradle will check hashes (md5 and sha256) of used dependencies and will fail builds with
-`Dependency verification failed` errors when local artifacts are absent or have different hashes listed in the
-[verification-metadata.xml](https://github.com/JetBrains/kotlin/blob/master/gradle/verification-metadata.xml) file.
+To include kotlin compiler into [composite build](https://docs.gradle.org/current/userguide/composite_builds.html) you need to define `dependencySubstitution` for `kotlin-compiler` module in `settings.gradle`

-It's expected that `verification-metadata.xml` should only be updated with the commits that modify the build. There are some tips how
-to perform such updates:
-
- Use auto-generation for getting an initial list of new hashes (verify updates relate to you changes).
-
-`./gradlew -M sha256,md5 help`
-
-*(any other task may be used instead of `help`)*
-
- Consider removing old versions from the file if you are updating dependencies.
- Leave meaningful `origin` attribute (instead of `Generated by Gradle`) if you did some manual verification of the artifact.
- Always do manual verification if several hashes are needed and a new `also-trust` tag has to be added.
- If you’re adding a dependency with OS mentioning in an artifact name (`darwin`, `mac`, `osx`, `linux`, `windows`), remember to add 
-  counterparts for other platforms.
-
-# License
-Kotlin is distributed under the terms of the Apache License (Version 2.0). See [license folder](license/README.md) for details.
+```
+includeBuild('/path/to/kotlin') {
+    dependencySubstitution {
+        substitute module('org.jetbrains.kotlin:kotlin-compiler') with project(':include:kotlin-compiler')
+    }
+}
+```

 # Contributing

-Please be sure to review Kotlin's [contributing guidelines](docs/contributing.md) to learn how to help the project.
+We love contributions! There's [lots to do on Kotlin](https://youtrack.jetbrains.com/issues/KT) and on the
+[standard library](https://youtrack.jetbrains.com/issues/KT?q=%23Kotlin%20%23Unresolved%20and%20(links:%20KT-2554,%20KT-4089%20or%20%23Libraries)) so why not chat with us
+about what you're interested in doing? Please join the #kontributors channel in [our Slack chat](http://slack.kotlinlang.org/)
+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/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.
+
+A nice gentle way to contribute would be to review the [standard library docs](https://kotlinlang.org/api/latest/jvm/stdlib/index.html)
+and find classes or functions which are not documented very well and submit a patch.
+
+In particular it'd be great if all functions included a nice example of how to use it such as for the
+[`hashMapOf()`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/hash-map-of.html) function.
+This is implemented using the [`@sample`](https://github.com/JetBrains/kotlin/blob/1.1.0/libraries/stdlib/src/kotlin/collections/Maps.kt#L91)
+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.
+
+Some of the code in the standard library is created by generating code from templates. See the [README](libraries/stdlib/ReadMe.md) in the stdlib section for how to run the code generator. The existing templates can be used as examples for creating new ones.
+
+## Submitting patches
+
+The best way to submit a patch is to [fork the project on github](https://help.github.com/articles/fork-a-repo/) then send us a
+[pull request](https://help.github.com/articles/creating-a-pull-request/) via [github](https://github.com).
+
+If you create your own fork, it might help to enable rebase by default
+when you pull by executing
+``` bash
+git config --global pull.rebase true
+```
+This will avoid your local repo having too many merge commits
+which will help keep your pull request simple and easy to apply.
--- a/ant/build.gradle.kts
+++ b/ant/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 dependencies {
    compile(commonDep("org.apache.ant", "ant"))
    compile(project(":kotlin-preloader"))
-    compile(kotlinStdlib())
+    compile(projectDist(":kotlin-stdlib"))
 }

 sourceSets {
@@ -17,5 +17,9 @@ sourceSets {
 }

 runtimeJar {
-    manifest.attributes["Class-Path"] = "$compilerManifestClassPath kotlin-preloader.jar"
+    from("$projectDir/src") { include("**/*.xml") }
+    manifest.attributes.put("Class-Path", "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar kotlin-preloader.jar")
 }
+
+dist()
+
--- a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt
@@ -16,24 +16,18 @@

 package org.jetbrains.kotlin.ant

-import org.apache.tools.ant.BuildException
-import org.apache.tools.ant.taskdefs.Execute
-import org.apache.tools.ant.taskdefs.Redirector
-import org.apache.tools.ant.types.*
+import org.apache.tools.ant.types.Path
+import org.apache.tools.ant.types.Reference
 import java.io.File.pathSeparator
-import java.io.File.separator

 class Kotlin2JvmTask : KotlinCompilerBaseTask() {
    override val compilerFqName = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"

-    var includeRuntime: Boolean = false
+    var includeRuntime: Boolean = true
    var moduleName: String? = null

    var noReflect: Boolean = false

-    private val cmdl = CommandlineJava()
-    var fork: Boolean = false
-
    private var compileClasspath: Path? = null

    fun setClasspath(classpath: Path) {
@@ -79,47 +73,4 @@ class Kotlin2JvmTask : KotlinCompilerBaseTask() {
        if (noReflect) args.add("-no-reflect")
        if (includeRuntime) args.add("-include-runtime")
    }
-
-    override fun execute() {
-        if (!fork)
-            super.execute()
-        else {
-            exec()
-        }
-    }
-
-    private fun exec() {
-        val javaHome = System.getProperty("java.home")
-        val javaBin = javaHome + separator + "bin" + separator + "java"
-        val redirector = Redirector(this)
-
-        fillArguments()
-
-        val command = ArrayList<String>()
-        command.add(javaBin)
-        command.addAll(cmdl.vmCommand.arguments) // jvm args
-        command.add("-Dorg.jetbrains.kotlin.cliMessageRenderer=FullPath") // same MessageRenderer as non-forking mode
-        command.add("-cp")
-        command.add(KotlinAntTaskUtil.compilerJar.canonicalPath)
-        command.add(compilerFqName)
-        command.addAll(args) // compiler args
-
-        // streamHandler: used to handle the input and output streams of the subprocess.
-        // watchdog: a watchdog for the subprocess or <code>null</code> to disable a timeout for the subprocess.
-        // TODO: support timeout for the subprocess
-        val exe = Execute(redirector.createHandler(), null)
-        exe.setAntRun(getProject())
-        exe.commandline = command.toTypedArray()
-        log("Executing command: ${command.joinToString(" ")}", LogLevel.DEBUG.level)
-        log("Compiling ${src!!.list().toList()} => [${output!!.canonicalPath}]")
-        val exitCode = exe.execute()
-        redirector.complete()
-        if (failOnError && exitCode != 0) {
-            throw BuildException("Compile failed; see the compiler error output for details.")
-        }
-    }
-
-    fun createJvmarg(): Commandline.Argument {
-        return cmdl.createVmArgument()
-    }
 }
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt
@@ -38,7 +38,7 @@ internal object KotlinAntTaskUtil {
    }

    val compilerJar: File by jar("kotlin-compiler.jar")
-    val runtimeJar: File by jar("kotlin-stdlib.jar")
+    val runtimeJar: File by jar("kotlin-runtime.jar")
    val reflectJar: File by jar("kotlin-reflect.jar")

    private fun jar(name: String) = lazy {
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt
@@ -129,7 +129,7 @@ class KotlinCompilerAdapter : Javac13() {
    }

    companion object {
-        private val KOTLIN_EXTENSIONS = listOf("kt", "kts")
+        private val KOTLIN_EXTENSIONS = Arrays.asList("kt", "kts")

        private fun filterOutKotlinSources(files: Array<File>): Array<File> {
            return files.filterNot {
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
@@ -80,7 +80,7 @@ abstract class KotlinCompilerBaseTask : Task() {
        fillSpecificArguments()
    }

-    override fun execute() {
+    final override fun execute() {
        fillArguments()

        val compilerClass = KotlinAntTaskUtil.getOrCreateClassLoader().loadClass(compilerFqName)
--- a/ant/resources/org/jetbrains/kotlin/ant/antlib.xml
+++ b/ant/resources/org/jetbrains/kotlin/ant/antlib.xml
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -1,115 +0,0 @@
-import kotlinx.benchmark.gradle.benchmark
-
-val benchmarks_version = "0.3.0"
-
-plugins {
-    java
-    kotlin("jvm")
-    id("org.jetbrains.kotlinx.benchmark") version "0.3.0"
-}
-
-dependencies {
-    compile(kotlinStdlib())
-    compile(project(":compiler:frontend"))
-    compile(projectTests(":compiler:tests-common"))
-    compile(project(":compiler:cli"))
-    compile(intellijCoreDep()) { includeJars("intellij-core") }
-    compile(jpsStandalone()) { includeJars("jps-model") }
-    compile(intellijPluginDep("java"))
-    compile(intellijDep()) { includeIntellijCoreJarDependencies(project) }
-    compile("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:$benchmarks_version")
-}
-
-sourceSets {
-    "main" { projectDefault() }
-}
-
-benchmark {
-    configurations {
-        named("main") {
-            warmups = 10
-            iterations = 10
-            iterationTime = 1
-            iterationTimeUnit = "sec"
-            param("size", 1000)
-        }
-
-        register("fir") {
-            warmups = 10
-            iterations = 10
-            iterationTime = 1
-            iterationTimeUnit = "sec"
-            param("isIR", true)
-            param("size", 1000)
-
-            include("CommonCallsBenchmark")
-            include("ControlFlowAnalysisBenchmark")
-            //include("InferenceBaselineCallsBenchmark")
-        }
-
-        register("ni") {
-            warmups = 10
-            iterations = 10
-            iterationTime = 1
-            iterationTimeUnit = "sec"
-            param("useNI", true)
-            param("isIR", false)
-            param("size", 1000)
-            include("InferenceBaselineCallsBenchmark")
-            include("InferenceExplicitArgumentsCallsBenchmark")
-            include("InferenceForInApplicableCandidate")
-            include("InferenceFromArgumentCallsBenchmark")
-            include("InferenceFromReturnTypeCallsBenchmark")
-        }
-    }
-    targets {
-        register("main")
-    }
-}
-
-tasks.matching { it is Zip && it.name == "mainBenchmarkJar" }.configureEach {
-    this as Zip
-    isZip64 = true
-    archiveFileName.set("benchmarks.jar")
-}
-
-val benchmarkTasks = listOf("mainBenchmark", "mainFirBenchmark", "mainNiBenchmark")
-tasks.matching { it is JavaExec && it.name in benchmarkTasks }.configureEach {
-    this as JavaExec
-    systemProperty("idea.home.path", intellijRootDir().canonicalPath)
-}
-
-tasks.register<JavaExec>("runBenchmark") {
-    // jmhArgs example: -PjmhArgs='CommonCalls -p size=500 -p isIR=true -p useNI=true -f 1'
-    val jmhArgs = if (project.hasProperty("jmhArgs")) project.property("jmhArgs").toString() else ""
-    val resultFilePath = "$buildDir/benchmarks/jmh-result.json"
-    val ideaHome = intellijRootDir().canonicalPath
-
-    val benchmarkJarPath = "$buildDir/benchmarks/main/jars/benchmarks.jar"
-    args = mutableListOf("-Didea.home.path=$ideaHome", benchmarkJarPath, "-rf", "json", "-rff", resultFilePath) + jmhArgs.split("\\s".toRegex())
-    main = "-jar"
-
-    doLast {
-        if (project.kotlinBuildProperties.isTeamcityBuild) {
-            val jsonArray = com.google.gson.JsonParser.parseString(File(resultFilePath).readText()).asJsonArray
-            jsonArray.forEach {
-                val benchmark = it.asJsonObject
-                // remove unnecessary name parts from string like this "org.jetbrains.kotlin.benchmarks.CommonCallsBenchmark.benchmark"
-                val name = benchmark["benchmark"].asString.removeSuffix(".benchmark").let {
-                    val indexOfLastDot = it.indexOfLast { it == '.' }
-                    it.removeRange(0..indexOfLastDot)
-                }
-                val params = benchmark["params"].asJsonObject
-                val isIR = if (params.has("isIR")) params["isIR"].asString else "false"
-                val useNI = if (params.has("useNI")) params["useNI"].asString else "false"
-                val size = params["size"].asString
-                val score = "%.3f".format(benchmark["primaryMetric"].asJsonObject["score"].asString.toFloat())
-
-                val irPostfix = if (isIR.toBoolean()) " isIR=true" else ""
-                val niPostfix = if (useNI.toBoolean() && !isIR.toBoolean()) " isNI=true" else ""
-
-                println("""##teamcity[buildStatisticValue key='$name size=$size${irPostfix}$niPostfix' value='$score']""")
-            }
-        }
-    }
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/AbstractInferenceBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/AbstractInferenceBenchmark.kt
@@ -1,19 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.Param
-import org.openjdk.jmh.annotations.Scope
-import org.openjdk.jmh.annotations.State
-
-@State(Scope.Benchmark)
-abstract class AbstractInferenceBenchmark : AbstractSimpleFileBenchmark() {
-    @Param("true", "false")
-    private var useNI: Boolean = false
-
-    override val useNewInference: Boolean
-        get() = useNI
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/AbstractSimpleFileBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/AbstractSimpleFileBenchmark.kt
@@ -1,169 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package org.jetbrains.kotlin.benchmarks
-
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.CharsetToolkit
-import com.intellij.psi.PsiElementFinder
-import com.intellij.psi.PsiFileFactory
-import com.intellij.psi.impl.PsiFileFactoryImpl
-import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.testFramework.LightVirtualFile
-import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
-import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
-import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.cli.jvm.compiler.*
-import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
-import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.context.SimpleGlobalContext
-import org.jetbrains.kotlin.context.withModule
-import org.jetbrains.kotlin.context.withProject
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.diagnostics.Severity
-import org.jetbrains.kotlin.fir.builder.RawFirBuilder
-import org.jetbrains.kotlin.fir.createSessionForTests
-import org.jetbrains.kotlin.fir.java.FirJavaElementFinder
-import org.jetbrains.kotlin.fir.resolve.firProvider
-import org.jetbrains.kotlin.fir.resolve.providers.impl.FirProviderImpl
-import org.jetbrains.kotlin.fir.resolve.transformers.FirTotalResolveProcessor
-import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.storage.ExceptionTracker
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.StorageManager
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.io.File
-
-private fun createFile(shortName: String, text: String, project: Project): KtFile {
-    val virtualFile = object : LightVirtualFile(shortName, KotlinLanguage.INSTANCE, text) {
-        override fun getPath(): String {
-            //TODO: patch LightVirtualFile
-            return "/" + name
-        }
-    }
-
-    virtualFile.charset = CharsetToolkit.UTF8_CHARSET
-    val factory = PsiFileFactory.getInstance(project) as PsiFileFactoryImpl
-
-    return factory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false) as KtFile
-}
-
-private val JDK_PATH = File("${System.getProperty("java.home")!!}/lib/rt.jar")
-private val RUNTIME_JAR = File(System.getProperty("kotlin.runtime.path") ?: "dist/kotlinc/lib/kotlin-runtime.jar")
-
-private val LANGUAGE_FEATURE_SETTINGS =
-    LanguageVersionSettingsImpl(
-        LanguageVersion.KOTLIN_1_3, ApiVersion.KOTLIN_1_3,
-        specificFeatures = mapOf(LanguageFeature.NewInference to LanguageFeature.State.ENABLED)
-    )
-
-private fun newConfiguration(useNewInference: Boolean): CompilerConfiguration {
-    val configuration = CompilerConfiguration()
-    configuration.put(CommonConfigurationKeys.MODULE_NAME, "benchmark")
-    configuration.put(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT, "../compiler/cli/cli-common/resources")
-    configuration.addJvmClasspathRoot(JDK_PATH)
-    configuration.addJvmClasspathRoot(RUNTIME_JAR)
-    configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
-
-    val newInferenceState = if (useNewInference) LanguageFeature.State.ENABLED else LanguageFeature.State.DISABLED
-    configuration.languageVersionSettings = LanguageVersionSettingsImpl(
-        LanguageVersion.KOTLIN_1_3, ApiVersion.KOTLIN_1_3,
-        specificFeatures = mapOf(
-            LanguageFeature.NewInference to newInferenceState
-        )
-    )
-    return configuration
-}
-
-@State(Scope.Benchmark)
-abstract class AbstractSimpleFileBenchmark {
-
-    private var myDisposable: Disposable = Disposable { }
-    private lateinit var env: KotlinCoreEnvironment
-    private lateinit var file: KtFile
-
-    @Param("true", "false")
-    protected var isIR: Boolean = false
-
-    protected open val useNewInference get() = isIR
-
-    @Setup(Level.Trial)
-    fun setUp() {
-        if (isIR && !useNewInference) error("Invalid configuration")
-        env = KotlinCoreEnvironment.createForTests(
-            myDisposable,
-            newConfiguration(useNewInference),
-            EnvironmentConfigFiles.JVM_CONFIG_FILES
-        )
-
-        if (isIR) {
-            PsiElementFinder.EP.getPoint(env.project).unregisterExtension(JavaElementFinder::class.java)
-        }
-
-        file = createFile(
-            "test.kt",
-            buildText(),
-            env.project
-        )
-    }
-
-    protected fun analyzeGreenFile(bh: Blackhole) {
-        if (isIR) {
-            analyzeGreenFileIr(bh)
-        } else {
-            analyzeGreenFileFrontend(bh)
-        }
-    }
-
-    private fun analyzeGreenFileFrontend(bh: Blackhole) {
-        val tracker = ExceptionTracker()
-        val storageManager: StorageManager =
-            LockBasedStorageManager.createWithExceptionHandling("benchmarks", tracker)
-
-        val context = SimpleGlobalContext(storageManager, tracker)
-        val module =
-            ModuleDescriptorImpl(
-                Name.special("<benchmark>"), storageManager,
-                JvmBuiltIns(storageManager, JvmBuiltIns.Kind.FROM_DEPENDENCIES)
-            )
-        val moduleContext = context.withProject(env.project).withModule(module)
-
-        val result = TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
-            moduleContext.project,
-            listOf(file),
-            NoScopeRecordCliBindingTrace(),
-            env.configuration,
-            { scope -> JvmPackagePartProvider(LANGUAGE_FEATURE_SETTINGS, scope) }
-        )
-
-        assert(result.bindingContext.diagnostics.none { it.severity == Severity.ERROR })
-
-        bh.consume(result.shouldGenerateCode)
-    }
-
-    private fun analyzeGreenFileIr(bh: Blackhole) {
-        val scope = GlobalSearchScope.filesScope(env.project, listOf(file.virtualFile))
-            .uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(env.project))
-        val session = createSessionForTests(env, scope)
-        val firProvider = session.firProvider as FirProviderImpl
-        val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider)
-
-        val totalTransformer = FirTotalResolveProcessor(session)
-        val firFile = builder.buildFirFile(file).also(firProvider::recordFile)
-
-        totalTransformer.process(listOf(firFile))
-
-        bh.consume(firFile.hashCode())
-        env.project.extensionArea
-            .getExtensionPoint<PsiElementFinder>(PsiElementFinder.EP.name)
-            .unregisterExtension(FirJavaElementFinder::class.java)
-    }
-
-    protected abstract fun buildText(): String
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/CommonCallsBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/CommonCallsBenchmark.kt
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class CommonCallsBenchmark : AbstractSimpleFileBenchmark(){
-
-    @Param("1", "10", "100", "1000", "3000", "5000", "7000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun foo(): Int = 1
-            |
-            |fun bar() {
-            |${(1..size).joinToString("\n") { "    foo()" }}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/ComplexDataFlowBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/ComplexDataFlowBenchmark.kt
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class ComplexDataFlowBenchmark : AbstractSimpleFileBenchmark(){
-
-    @Param("1", "100", "1000", "3000", "5000", "7000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |
-            |fun bar(x: Any?) {
-            |   var y = x
-            |${(1..size).joinToString("\n") {
-                """
-                |if (x is String) {
-                |   y = x
-                |}
-                |y = 1
-                """.trimMargin()
-            }}
-            |}
-            """.trimMargin()
-
-}
-
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/ControlFlowAnalysisBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/ControlFlowAnalysisBenchmark.kt
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class ControlFlowAnalysisBenchmark : AbstractSimpleFileBenchmark() {
-    @Param("1000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-        buildString {
-            appendLine("fun test() {")
-            for (i in 0 until size) {
-                appendLine("for (i$i in 0..10) { ")
-            }
-            for (i in 0 until size) {
-                appendLine("}")
-            }
-            appendLine("}")
-        }
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/ControlFlowOperators.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/ControlFlowOperators.kt
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class ControlFlowOperators : AbstractSimpleFileBenchmark(){
-
-    @Param("1", "100", "1000", "3000", "5000", "7000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |var isTrue = true
-            |var s = ""
-            |fun bar() {
-            |${(1..size).joinToString("\n") {
-                """
-                |var x$it: String
-                |
-                |when (s) {
-                |   "A" -> { x$it = "1" }
-                |   "B" -> { x$it = "2" }
-                |   else -> { x$it = "3" }
-                |}
-                |
-                |while (isTrue) {
-                |   x$it.hashCode()
-                |}
-                """.trimMargin()
-            }}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceBaselineCallsBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceBaselineCallsBenchmark.kt
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class InferenceBaselineCallsBenchmark : AbstractSimpleFileBenchmark() {
-
-    @Param("1", "10", "100", "1000", "5000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun foo(x: Int): Int = 1
-            |fun expectsInt(x: Int) {}
-            |fun bar(v: Int) {
-            |${(1..size).map { "    expectsInt(foo(v))" }.joinToString("\n")}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceExplicitArgumentsCallsBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceExplicitArgumentsCallsBenchmark.kt
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class InferenceExplicitArgumentsCallsBenchmark : AbstractInferenceBenchmark() {
-
-    @Param("1", "10", "100", "1000", "5000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun <T> foo(x: T): Int = 1
-            |fun expectsInt(x: Int) {}
-            |fun bar(v: Int) {
-            |${(1..size).map { "    expectsInt(foo<Int>(v))" }.joinToString("\n")}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceForInApplicableCandidate.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceForInApplicableCandidate.kt
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class InferenceForInApplicableCandidate : AbstractInferenceBenchmark() {
-
-    @Param("1", "10", "100", "1000", "5000", "10000")
-    private var size: Int = 1
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun <T : Comparable<T>> foo(x: MutableList<T>) {}
-            |fun <T> foo(x: MutableList<T>, y: (T, T) -> Int) {}
-            |fun bar(x: MutableList<Any>) {
-            |${(1..size).joinToString("\n") { "    foo(x) { a, b -> 1 }" }}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceFromArgumentCallsBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceFromArgumentCallsBenchmark.kt
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class InferenceFromArgumentCallsBenchmark : AbstractInferenceBenchmark() {
-
-    @Param("1", "10", "100", "1000", "5000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun <T> foo(x: T): Int = 1
-            |fun expectsInt(x: Int) {}
-            |fun bar(v: Int) {
-            |${(1..size).map { "    expectsInt(foo(v))" }.joinToString("\n")}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceFromReturnTypeCallsBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/InferenceFromReturnTypeCallsBenchmark.kt
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class InferenceFromReturnTypeCallsBenchmark : AbstractInferenceBenchmark() {
-
-    @Param("1", "10", "100", "1000", "5000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun <T> foo(x: Int): T = null!!
-            |fun expectsInt(x: Int) {}
-            |fun bar(v: Int) {
-            |${(1..size).map { "    expectsInt(foo(v))" }.joinToString("\n")}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/IntArrayPlusBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/IntArrayPlusBenchmark.kt
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class IntArrayPlusBenchmark : AbstractSimpleFileBenchmark() {
-
-    @Param("1", "10", "100", "1000", "3000", "5000", "7000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    //@Fork(jvmArgsAppend = ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"])
-    fun benchmark(bh: Blackhole) {
-        if (!isIR) error("Doesn't make sense to run it on old frontend on buildserver")
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun bar(x: IntArray, y: IntArray) {
-            |${(1..size).joinToString("\n") { "    x + y" }}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/ManyImplicitReceiversBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/ManyImplicitReceiversBenchmark.kt
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class ManyImplicitReceiversBenchmark : AbstractSimpleFileBenchmark() {
-    @Param("1", "10", "50")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText(): String {
-        return buildString {
-            appendLine("inline fun <T, R> with(receiver: T, block: T.() -> R): R = block()")
-
-            for (i in 1..size) {
-                appendLine("interface A$i {")
-                appendLine("    fun foo$i()")
-                appendLine("}")
-                appendLine()
-            }
-            appendLine()
-            append("fun test(")
-            append((1..size).joinToString(", ") { "a$it: A$it" })
-            appendLine(" {")
-            for (i in 1..size) {
-                appendLine("with(a$i) {")
-            }
-            for (i in 1..size) {
-                appendLine("foo$i()")
-            }
-            for (i in 1..size) {
-                appendLine("}")
-            }
-            appendLine("}")
-        }
-    }
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/ManyValsBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/ManyValsBenchmark.kt
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class ManyValsBenchmark : AbstractSimpleFileBenchmark(){
-
-    @Param("1", "100", "1000", "3000", "5000", "7000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun bar() {
-            |${(1..size).joinToString("\n") { "    val x$it: Int = 1" }}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/ManyVarsBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/ManyVarsBenchmark.kt
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class ManyVarsBenchmark : AbstractSimpleFileBenchmark(){
-
-    @Param("1", "100", "1000", "3000", "5000", "7000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun bar() {
-            |${(1..size).joinToString("\n") { "    var x$it: Int = 1" }}
-            |}
-            """.trimMargin()
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/PlusAssignOperatorDesugaringBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/PlusAssignOperatorDesugaringBenchmark.kt
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class PlusAssignOperatorDesugaringBenchmark : AbstractInferenceBenchmark() {
-    @Param("9", "10", "11", "12", "13", "14")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText(): String = buildString {
-        appendLine(
-            """
-            class A {
-                operator fun <T : Number> plus(other: (Int) -> T): A = this
-                operator fun <T : CharSequence> plusAssign(other: (String) -> T) {}
-            }
-        """.trimIndent()
-        )
-        appendLine("fun test() {")
-        appendLine("var a = A()")
-        for (i in 1..size) {
-            appendLine("a += {")
-        }
-        for (i in 1..size) {
-            appendLine(
-                """
-                it.inc()
-                1
-                }
-            """.trimIndent()
-            )
-        }
-        appendLine()
-    }
-}
--- a/benchmarks/src/org/jetbrains/kotlin/benchmarks/SimpleDataFlowBenchmark.kt
+++ b/benchmarks/src/org/jetbrains/kotlin/benchmarks/SimpleDataFlowBenchmark.kt
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.benchmarks
-
-import org.openjdk.jmh.annotations.*
-import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
-open class SimpleDataFlowBenchmark : AbstractSimpleFileBenchmark(){
-
-    @Param("1", "100", "1000", "3000", "5000", "7000", "10000")
-    private var size: Int = 0
-
-    @Benchmark
-    fun benchmark(bh: Blackhole) {
-        analyzeGreenFile(bh)
-    }
-
-    override fun buildText() =
-            """
-            |fun foo(x: Int): Int = 1
-            |var x = 1
-            |fun bar(v: Int) {
-            |${(1..size).joinToString("\n") { "    x = foo(v)" }}
-            |}
-            """.trimMargin()
-
-
-}
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -1,3 +1,4 @@
+
 description = "Kotlin Build Common"

 plugins {
@@ -7,26 +8,23 @@ plugins {

 dependencies {
    compileOnly(project(":core:util.runtime"))
-    compileOnly(project(":compiler:backend.common.jvm"))
    compileOnly(project(":compiler:util"))
    compileOnly(project(":compiler:cli-common"))
    compileOnly(project(":compiler:frontend.java"))
    compileOnly(project(":js:js.serializer"))
-    compileOnly(project(":js:js.config"))
-    compileOnly(project(":kotlin-util-klib-metadata"))
+    compileOnly(project(":js:js.frontend"))
    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "util", rootProject = rootProject) }
+    compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "util") }
    compileOnly(project(":kotlin-reflect-api"))

    testCompileOnly(project(":compiler:cli-common"))
    testCompile(projectTests(":compiler:tests-common"))
    testCompile(commonDep("junit:junit"))
    testCompile(protobufFull())
-    testCompile(kotlinStdlib())
-    Platform[193].orLower {
-        testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
-    }
-    testRuntime(project(":kotlin-reflect"))
+    testCompile(projectDist(":kotlin-stdlib"))
+    testCompileOnly(intellijDep()) { includeJars("openapi") }
+
+    testRuntime(projectDist(":kotlin-reflect"))
 }

 sourceSets {
@@ -34,12 +32,12 @@ sourceSets {
    "test" { projectDefault() }
 }

-publish()
-
 runtimeJar()
 sourcesJar()
 javadocJar()

 testsJar()

-projectTest(parallel = true)
+projectTest()
+
+publish()
--- a/build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.build
@@ -17,6 +17,9 @@ interface BuildMetaInfo {
    val compilerBuildVersion: String
    val languageVersionString: String
    val apiVersionString: String
+    val coroutinesEnable: Boolean
+    val coroutinesWarn: Boolean
+    val coroutinesError: Boolean
    val multiplatformEnable: Boolean
    val metadataVersionMajor: Int
    val metadataVersionMinor: Int
@@ -32,6 +35,9 @@ abstract class BuildMetaInfoFactory<T : BuildMetaInfo>(private val metaInfoClass
        compilerBuildVersion: String,
        languageVersionString: String,
        apiVersionString: String,
+        coroutinesEnable: Boolean,
+        coroutinesWarn: Boolean,
+        coroutinesError: Boolean,
        multiplatformEnable: Boolean,
        ownVersion: Int,
        coroutinesVersion: Int,
@@ -47,6 +53,9 @@ abstract class BuildMetaInfoFactory<T : BuildMetaInfo>(private val metaInfoClass
            compilerBuildVersion = KotlinCompilerVersion.VERSION,
            languageVersionString = languageVersion.versionString,
            apiVersionString = args.apiVersion ?: languageVersion.versionString,
+            coroutinesEnable = args.coroutinesState == CommonCompilerArguments.ENABLE,
+            coroutinesWarn = args.coroutinesState == CommonCompilerArguments.WARN,
+            coroutinesError = args.coroutinesState == CommonCompilerArguments.ERROR,
            multiplatformEnable = args.multiPlatform,
            ownVersion = OWN_VERSION,
            coroutinesVersion = COROUTINES_VERSION,
@@ -55,9 +64,6 @@ abstract class BuildMetaInfoFactory<T : BuildMetaInfo>(private val metaInfoClass
        )
    }

-    fun serializeToString(args: CommonCompilerArguments): String =
-        serializeToString(create(args))
-
    fun serializeToString(info: T): String =
        serializeToPlainText(info, metaInfoClass)

--- a/build-common/src/org/jetbrains/kotlin/build/CommonBuildMetaInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/CommonBuildMetaInfo.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.build
@@ -15,6 +15,9 @@ data class CommonBuildMetaInfo(
    override val compilerBuildVersion: String,
    override val languageVersionString: String,
    override val apiVersionString: String,
+    override val coroutinesEnable: Boolean,
+    override val coroutinesWarn: Boolean,
+    override val coroutinesError: Boolean,
    override val multiplatformEnable: Boolean,
    override val metadataVersionMajor: Int,
    override val metadataVersionMinor: Int,
@@ -29,6 +32,9 @@ data class CommonBuildMetaInfo(
            compilerBuildVersion: String,
            languageVersionString: String,
            apiVersionString: String,
+            coroutinesEnable: Boolean,
+            coroutinesWarn: Boolean,
+            coroutinesError: Boolean,
            multiplatformEnable: Boolean,
            ownVersion: Int,
            coroutinesVersion: Int,
@@ -41,6 +47,9 @@ data class CommonBuildMetaInfo(
                compilerBuildVersion = compilerBuildVersion,
                languageVersionString = languageVersionString,
                apiVersionString = apiVersionString,
+                coroutinesEnable = coroutinesEnable,
+                coroutinesWarn = coroutinesWarn,
+                coroutinesError = coroutinesError,
                multiplatformEnable = multiplatformEnable,
                metadataVersionMajor = metadataVersion.major,
                metadataVersionMinor = metadataVersion.minor,
--- a/build-common/src/org/jetbrains/kotlin/build/ExecutionStrategy.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/ExecutionStrategy.kt
@@ -1,12 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build
-
-import java.io.Serializable
-
-enum class ExecutionStrategy : Serializable {
-    DAEMON, IN_PROCESS, OUT_OF_PROCESS
-}
--- a/build-common/src/org/jetbrains/kotlin/build/JsBuildMetaInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/JsBuildMetaInfo.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.build
@@ -15,6 +15,9 @@ data class JsBuildMetaInfo(
    override val compilerBuildVersion: String,
    override val languageVersionString: String,
    override val apiVersionString: String,
+    override val coroutinesEnable: Boolean,
+    override val coroutinesWarn: Boolean,
+    override val coroutinesError: Boolean,
    override val multiplatformEnable: Boolean,
    override val metadataVersionMajor: Int,
    override val metadataVersionMinor: Int,
@@ -29,6 +32,9 @@ data class JsBuildMetaInfo(
            compilerBuildVersion: String,
            languageVersionString: String,
            apiVersionString: String,
+            coroutinesEnable: Boolean,
+            coroutinesWarn: Boolean,
+            coroutinesError: Boolean,
            multiplatformEnable: Boolean,
            ownVersion: Int,
            coroutinesVersion: Int,
@@ -41,6 +47,9 @@ data class JsBuildMetaInfo(
                compilerBuildVersion = compilerBuildVersion,
                languageVersionString = languageVersionString,
                apiVersionString = apiVersionString,
+                coroutinesEnable = coroutinesEnable,
+                coroutinesWarn = coroutinesWarn,
+                coroutinesError = coroutinesError,
                multiplatformEnable = multiplatformEnable,
                metadataVersionMajor = metadataVersion.major,
                metadataVersionMinor = metadataVersion.minor,
--- a/build-common/src/org/jetbrains/kotlin/build/JvmBuildMetaInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/JvmBuildMetaInfo.kt
@@ -16,7 +16,7 @@

 package org.jetbrains.kotlin.build

-import org.jetbrains.kotlin.load.kotlin.JvmBytecodeBinaryVersion
+import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmBytecodeBinaryVersion
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion

 /**
@@ -27,6 +27,9 @@ data class JvmBuildMetaInfo(
    override val compilerBuildVersion: String,
    override val languageVersionString: String,
    override val apiVersionString: String,
+    override val coroutinesEnable: Boolean,
+    override val coroutinesWarn: Boolean,
+    override val coroutinesError: Boolean,
    override val multiplatformEnable: Boolean,
    override val metadataVersionMajor: Int,
    override val metadataVersionMinor: Int,
@@ -44,6 +47,9 @@ data class JvmBuildMetaInfo(
            compilerBuildVersion: String,
            languageVersionString: String,
            apiVersionString: String,
+            coroutinesEnable: Boolean,
+            coroutinesWarn: Boolean,
+            coroutinesError: Boolean,
            multiplatformEnable: Boolean,
            ownVersion: Int,
            coroutinesVersion: Int,
@@ -56,6 +62,9 @@ data class JvmBuildMetaInfo(
                compilerBuildVersion = compilerBuildVersion,
                languageVersionString = languageVersionString,
                apiVersionString = apiVersionString,
+                coroutinesEnable = coroutinesEnable,
+                coroutinesWarn = coroutinesWarn,
+                coroutinesError = coroutinesError,
                multiplatformEnable = multiplatformEnable,
                metadataVersionMajor = metadataVersion.major,
                metadataVersionMinor = metadataVersion.minor,
--- a/build-common/src/org/jetbrains/kotlin/build/generatedFiles.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/generatedFiles.kt
@@ -22,17 +22,13 @@ import org.jetbrains.kotlin.utils.sure
 import java.io.File

 open class GeneratedFile(
-    sourceFiles: Collection<File>,
+    val sourceFiles: Collection<File>,
    val outputFile: File
-) {
-    val sourceFiles = sourceFiles.sortedBy { it.path }
+)

-    override fun toString(): String = "${this::class.java.simpleName}: $outputFile"
-}
-
-class GeneratedJvmClass(
-    sourceFiles: Collection<File>,
-    outputFile: File
+class GeneratedJvmClass (
+        sourceFiles: Collection<File>,
+        outputFile: File
 ) : GeneratedFile(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"
--- a/build-common/src/org/jetbrains/kotlin/build/report/BuildReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/BuildReporter.kt
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report
-
-import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
-import org.jetbrains.kotlin.build.report.metrics.RemoteBuildMetricsReporter
-
-open class BuildReporter(
-    protected open val icReporter: ICReporter,
-    protected open val buildMetricsReporter: BuildMetricsReporter
-) : ICReporter by icReporter, BuildMetricsReporter by buildMetricsReporter
-
-class RemoteBuildReporter(
-    override val icReporter: RemoteICReporter,
-    override val buildMetricsReporter: RemoteBuildMetricsReporter
-) : BuildReporter(icReporter, buildMetricsReporter), RemoteReporter {
-    override fun flush() {
-        icReporter.flush()
-        buildMetricsReporter.flush()
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/ICReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/ICReporter.kt
@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report
-
-import org.jetbrains.kotlin.cli.common.ExitCode
-import java.io.File
-
-interface ICReporter {
-    fun report(message: () -> String)
-    fun reportVerbose(message: () -> String)
-
-    fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode)
-    fun reportMarkDirtyClass(affectedFiles: Iterable<File>, classFqName: String)
-    fun reportMarkDirtyMember(affectedFiles: Iterable<File>, scope: String, name: String)
-    fun reportMarkDirty(affectedFiles: Iterable<File>, reason: String)
-}
-
-
--- a/build-common/src/org/jetbrains/kotlin/build/report/ICReporterBase.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/ICReporterBase.kt
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report
-
-import java.io.File
-
-abstract class ICReporterBase(private val pathsBase: File? = null) : ICReporter {
-    override fun reportMarkDirtyClass(affectedFiles: Iterable<File>, classFqName: String) {
-        reportMarkDirty(affectedFiles, "dirty class $classFqName")
-    }
-
-    override fun reportMarkDirtyMember(affectedFiles: Iterable<File>, scope: String, name: String) {
-        reportMarkDirty(affectedFiles, "dirty member $scope#$name")
-    }
-
-    override fun reportMarkDirty(affectedFiles: Iterable<File>, reason: String) {
-        affectedFiles.forEach { file ->
-            reportVerbose { "${pathsAsString(file)} is marked dirty: $reason" }
-        }
-    }
-
-    protected fun relativizeIfPossible(files: Iterable<File>): List<File> =
-        files.map { it.relativeOrCanonical() }
-
-    protected fun pathsAsString(files: Iterable<File>): String =
-        relativizeIfPossible(files).map { it.path }.sorted().joinToString()
-
-    protected fun pathsAsString(vararg files: File): String =
-        pathsAsString(files.toList())
-
-    protected fun File.relativeOrCanonical(): File =
-        pathsBase?.let { relativeToOrNull(it) } ?: canonicalFile
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/RemoteICReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/RemoteICReporter.kt
@@ -1,9 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report
-
-interface RemoteICReporter : ICReporter,
-    RemoteReporter
--- a/build-common/src/org/jetbrains/kotlin/build/report/RemoteReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/RemoteReporter.kt
@@ -1,11 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report
-
-interface RemoteReporter {
-    fun flush()
-}
-
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttribute.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttribute.kt
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-import java.io.Serializable
-
-enum class BuildAttributeKind : Serializable {
-    REBUILD_REASON;
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}
-
-enum class BuildAttribute(val kind: BuildAttributeKind) : Serializable {
-    NO_BUILD_HISTORY(BuildAttributeKind.REBUILD_REASON),
-    CACHE_CORRUPTION(BuildAttributeKind.REBUILD_REASON),
-    UNKNOWN_CHANGES_IN_GRADLE_INPUTS(BuildAttributeKind.REBUILD_REASON),
-    JAVA_CHANGE_UNTRACKED_FILE_IS_REMOVED(BuildAttributeKind.REBUILD_REASON),
-    JAVA_CHANGE_UNEXPECTED_PSI(BuildAttributeKind.REBUILD_REASON),
-    JAVA_CHANGE_UNKNOWN_QUALIFIER(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_REMOVED_ENTRY(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_HISTORY_IS_NOT_FOUND(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_HISTORY_CANNOT_BE_READ(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_HISTORY_NO_KNOWN_BUILDS(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_NON_INCREMENTAL_BUILD_IN_DEP(BuildAttributeKind.REBUILD_REASON),
-    IN_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON),
-    OUT_OF_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON),
-    IC_IS_NOT_ENABLED(BuildAttributeKind.REBUILD_REASON);
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttributes.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttributes.kt
@@ -1,30 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-import java.io.Serializable
-import java.util.*
-
-class BuildAttributes : Serializable {
-    private val myAttributes =
-        EnumMap<BuildAttribute, Int>(
-            BuildAttribute::class.java
-        )
-
-    fun add(attr: BuildAttribute, count: Int = 1) {
-        myAttributes[attr] = myAttributes.getOrDefault(attr, 0) + count
-    }
-
-    fun addAll(other: BuildAttributes) {
-        other.myAttributes.forEach { (attr, n) -> add(attr, n) }
-    }
-
-    fun asMap(): Map<BuildAttribute, Int> = myAttributes
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetrics.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetrics.kt
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-import java.io.Serializable
-
-data class BuildMetrics(
-    val buildTimes: BuildTimes = BuildTimes(),
-    val buildAttributes: BuildAttributes = BuildAttributes()
-) : Serializable {
-    fun addAll(other: BuildMetrics) {
-        buildTimes.addAll(other.buildTimes)
-        buildAttributes.addAll(other.buildAttributes)
-    }
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporter.kt
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-interface BuildMetricsReporter {
-    fun startMeasure(metric: BuildTime, startNs: Long)
-    fun endMeasure(metric: BuildTime, endNs: Long)
-
-    fun addAttribute(attribute: BuildAttribute)
-
-    fun getMetrics(): BuildMetrics
-    fun addMetrics(metrics: BuildMetrics?)
-}
-
-inline fun <T> BuildMetricsReporter.measure(metric: BuildTime, fn: () -> T): T {
-    val start = System.nanoTime()
-    startMeasure(metric, start)
-
-    try {
-        return fn()
-    } finally {
-        val end = System.nanoTime()
-        endMeasure(metric, end)
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporterImpl.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporterImpl.kt
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-import java.util.*
-
-class BuildMetricsReporterImpl : BuildMetricsReporter {
-    private val myBuildTimeStartNs: EnumMap<BuildTime, Long> =
-        EnumMap(
-            BuildTime::class.java
-        )
-    private val myBuildTimes = BuildTimes()
-    private val myBuildAttributes = BuildAttributes()
-
-    override fun startMeasure(metric: BuildTime, startNs: Long) {
-        if (metric in myBuildTimeStartNs) {
-            error("$metric was restarted before it finished")
-        }
-        myBuildTimeStartNs[metric] = startNs
-    }
-
-    override fun endMeasure(metric: BuildTime, endNs: Long) {
-        val startNs = myBuildTimeStartNs.remove(metric) ?: error("$metric finished before it started")
-        val durationNs = endNs - startNs
-        myBuildTimes.add(metric, durationNs)
-    }
-
-    override fun addAttribute(attribute: BuildAttribute) {
-        myBuildAttributes.add(attribute)
-    }
-
-    override fun getMetrics(): BuildMetrics =
-        BuildMetrics(
-            buildTimes = myBuildTimes,
-            buildAttributes = myBuildAttributes
-        )
-
-    override fun addMetrics(metrics: BuildMetrics?) {
-        if (metrics == null) return
-
-        myBuildAttributes.addAll(metrics.buildAttributes)
-        myBuildTimes.addAll(metrics.buildTimes)
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTime.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTime.kt
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-import java.io.Serializable
-
-@Suppress("Reformat")
-enum class BuildTime(val parent: BuildTime? = null) : Serializable {
-    GRADLE_TASK,
-        CLEAR_OUTPUT(GRADLE_TASK),
-        BACKUP_OUTPUT(GRADLE_TASK),
-        RESTORE_OUTPUT_FROM_BACKUP(GRADLE_TASK),
-        CONNECT_TO_DAEMON(GRADLE_TASK),
-        CLEAR_JAR_CACHE(GRADLE_TASK),
-        RUN_COMPILER(GRADLE_TASK),
-            NON_INCREMENTAL_COMPILATION_IN_PROCESS(RUN_COMPILER),
-            NON_INCREMENTAL_COMPILATION_OUT_OF_PROCESS(RUN_COMPILER),
-            NON_INCREMENTAL_COMPILATION_DAEMON(RUN_COMPILER),
-            INCREMENTAL_COMPILATION(RUN_COMPILER),
-                IC_CALCULATE_INITIAL_DIRTY_SET(INCREMENTAL_COMPILATION),
-                    IC_ANALYZE_CHANGES_IN_DEPENDENCIES(IC_CALCULATE_INITIAL_DIRTY_SET),
-                        IC_FIND_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES),
-                        IC_ANALYZE_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES),
-                    IC_ANALYZE_CHANGES_IN_JAVA_SOURCES(IC_CALCULATE_INITIAL_DIRTY_SET),
-                    IC_ANALYZE_CHANGES_IN_ANDROID_LAYOUTS(IC_CALCULATE_INITIAL_DIRTY_SET),
-                    IC_DETECT_REMOVED_CLASSES(IC_CALCULATE_INITIAL_DIRTY_SET),
-                CLEAR_OUTPUT_ON_REBUILD(INCREMENTAL_COMPILATION),
-                IC_UPDATE_CACHES(INCREMENTAL_COMPILATION),
-                INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION),
-                NON_INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION),
-                IC_WRITE_HISTORY_FILE(INCREMENTAL_COMPILATION);
-
-    companion object {
-        const val serialVersionUID = 0L
-
-        val children by lazy {
-            values().filter { it.parent != null }.groupBy { it.parent }
-        }
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTimes.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTimes.kt
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-import java.io.Serializable
-import java.util.*
-
-class BuildTimes : Serializable {
-    private val myBuildTimes = EnumMap<BuildTime, Long>(BuildTime::class.java)
-
-    fun addAll(other: BuildTimes) {
-        for ((bt, timeNs) in other.myBuildTimes) {
-            add(bt, timeNs)
-        }
-    }
-
-    fun add(buildTime: BuildTime, timeNs: Long) {
-        myBuildTimes[buildTime] = myBuildTimes.getOrDefault(buildTime, 0) + timeNs
-    }
-
-    fun asMap(): Map<BuildTime, Long> = myBuildTimes
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/DoNothingBuildMetricsReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/DoNothingBuildMetricsReporter.kt
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-object DoNothingBuildMetricsReporter : BuildMetricsReporter {
-    override fun startMeasure(metric: BuildTime, startNs: Long) {
-    }
-
-    override fun endMeasure(metric: BuildTime, endNs: Long) {
-    }
-
-    override fun addAttribute(attribute: BuildAttribute) {
-    }
-
-    override fun getMetrics(): BuildMetrics =
-        BuildMetrics(
-            BuildTimes(),
-            BuildAttributes()
-        )
-
-    override fun addMetrics(metrics: BuildMetrics?) {}
-}
--- a/build-common/src/org/jetbrains/kotlin/build/report/metrics/RemoteBuildMetricsReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/report/metrics/RemoteBuildMetricsReporter.kt
@@ -1,11 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build.report.metrics
-
-import org.jetbrains.kotlin.build.report.RemoteReporter
-
-interface RemoteBuildMetricsReporter : BuildMetricsReporter,
-    RemoteReporter
--- a/build-common/src/org/jetbrains/kotlin/build/sourcesUtils.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/sourcesUtils.kt
@@ -1,9 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build
-
-val DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS = listOf("kt", "kts")
-
--- a/build-common/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java
+++ b/build-common/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java
@@ -16,6 +16,7 @@

 package org.jetbrains.kotlin.compilerRunner;

+import com.intellij.util.containers.ContainerUtil;
 import kotlin.collections.CollectionsKt;
 import kotlin.jvm.JvmClassMappingKt;
 import kotlin.reflect.KClass;
@@ -24,48 +25,25 @@ import kotlin.reflect.KVisibility;
 import kotlin.reflect.full.KClasses;
 import kotlin.reflect.jvm.ReflectJvmMapping;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.common.arguments.Argument;
 import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments;
 import org.jetbrains.kotlin.cli.common.arguments.InternalArgument;
 import org.jetbrains.kotlin.cli.common.arguments.ParseCommandLineArgumentsKt;
-import org.jetbrains.kotlin.idea.ExplicitDefaultSubstitutor;
-import org.jetbrains.kotlin.idea.ExplicitDefaultSubstitutorsKt;
 import org.jetbrains.kotlin.utils.StringsKt;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;

 public class ArgumentUtils {
-    private ArgumentUtils() {
-    }
+    private ArgumentUtils() {}

    @NotNull
    public static List<String> convertArgumentsToStringList(@NotNull CommonToolArguments arguments)
            throws InstantiationException, IllegalAccessException, InvocationTargetException {
-        List<String> convertedArguments = convertArgumentsToStringListInternal(arguments);
-
-        Map<KClass<? extends CommonToolArguments>, Collection<ExplicitDefaultSubstitutor>> defaultSubstitutorsMap =
-                ExplicitDefaultSubstitutorsKt.getDefaultSubstitutors();
-        KClass<? extends CommonToolArguments> argumentsKClass = JvmClassMappingKt.getKotlinClass(arguments.getClass());
-        Collection<ExplicitDefaultSubstitutor> defaultSubstitutors = defaultSubstitutorsMap.get(argumentsKClass);
-        if (defaultSubstitutors != null) {
-            for (ExplicitDefaultSubstitutor substitutor : defaultSubstitutors) {
-                if (substitutor.isSubstitutable(convertedArguments)) convertedArguments.addAll(substitutor.getNewSubstitution());
-            }
-        }
-        return convertedArguments;
-    }
-
-    @NotNull
-    public static List<String> convertArgumentsToStringListNoDefaults(@NotNull CommonToolArguments arguments)
-            throws InstantiationException, IllegalAccessException, InvocationTargetException {
-        return convertArgumentsToStringListInternal(arguments);
-    }
-
-    private static List<String> convertArgumentsToStringListInternal(@NotNull CommonToolArguments arguments)
-            throws InstantiationException, IllegalAccessException, InvocationTargetException {
        List<String> result = new ArrayList<>();
        Class<? extends CommonToolArguments> argumentsClass = arguments.getClass();
        convertArgumentsToStringList(arguments, argumentsClass.newInstance(), JvmClassMappingKt.getKotlinClass(argumentsClass), result);
@@ -82,7 +60,7 @@ public class ArgumentUtils {
            @NotNull List<String> result
    ) throws IllegalAccessException, InstantiationException, InvocationTargetException {
        for (KProperty1 property : KClasses.getMemberProperties(clazz)) {
-            Argument argument = findInstance(property.getAnnotations(), Argument.class);
+            Argument argument = ContainerUtil.findInstance(property.getAnnotations(), Argument.class);
            if (argument == null) continue;

            if (property.getVisibility() != KVisibility.PUBLIC) continue;
@@ -112,14 +90,4 @@ public class ArgumentUtils {
            }
        }
    }
-
-    @Nullable
-    private static <T> T findInstance(Iterable<? super T> iterable, Class<T> clazz) {
-        for (Object item : iterable) {
-            if (clazz.isInstance(item)) {
-                return clazz.cast(item);
-            }
-        }
-        return null;
-    }
 }
--- a/build-common/src/org/jetbrains/kotlin/compilerRunner/MessageCollectorToOutputItemsCollectorAdapter.kt
+++ b/build-common/src/org/jetbrains/kotlin/compilerRunner/MessageCollectorToOutputItemsCollectorAdapter.kt
@@ -16,7 +16,7 @@

 package org.jetbrains.kotlin.compilerRunner

-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil
@@ -25,7 +25,7 @@ class MessageCollectorToOutputItemsCollectorAdapter(
        private val delegate: MessageCollector,
        private val outputCollector: OutputItemsCollector
 ) : MessageCollector by delegate {
-    override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageSourceLocation?) {
+    override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
        // TODO: consider adding some other way of passing input -> output mapping from compiler, e.g. dedicated service
        OutputMessageUtil.parseOutputMessage(message)?.let {
            outputCollector.add(it.sourceFiles, it.outputFile)
--- a/build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
+++ b/build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
@@ -16,15 +16,15 @@

 package org.jetbrains.kotlin.compilerRunner;

+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

 public class OutputItemsCollectorImpl implements OutputItemsCollector {
-    private final List<SimpleOutputItem> outputs = new ArrayList<>();
+    private final List<SimpleOutputItem> outputs = ContainerUtil.newArrayList();

    @Override
    public void add(Collection<File> sourceFiles, File outputFile) {
--- a/build-common/src/org/jetbrains/kotlin/idea/explicitDefaultSubstitutors.kt
+++ b/build-common/src/org/jetbrains/kotlin/idea/explicitDefaultSubstitutors.kt
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea
-
-import org.jetbrains.kotlin.cli.common.arguments.Argument
-import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.config.JvmTarget
-import kotlin.reflect.KClass
-import kotlin.reflect.KProperty1
-import kotlin.reflect.full.findAnnotation
-
-val defaultSubstitutors: Map<KClass<out CommonToolArguments>, Collection<ExplicitDefaultSubstitutor>> =
-    mapOf(K2JVMCompilerArguments::class to listOf(JvmTargetDefaultSubstitutor))
-
-sealed class ExplicitDefaultSubstitutor {
-    abstract val substitutedProperty: KProperty1<out CommonToolArguments, String?>
-    abstract val oldSubstitution: List<String>
-    abstract val newSubstitution: List<String>
-    abstract fun isSubstitutable(args: List<String>): Boolean
-
-    protected val argument: Argument by lazy {
-        substitutedProperty.findAnnotation() ?: error("Property \"${substitutedProperty.name}\" has no Argument annotation")
-    }
-}
-
-object JvmTargetDefaultSubstitutor : ExplicitDefaultSubstitutor() {
-    override val substitutedProperty
-        get() = K2JVMCompilerArguments::jvmTarget
-    private val oldDefault: String
-        get() = JvmTarget.JVM_1_6.description
-    private val newDefault: String
-        get() = JvmTarget.JVM_1_8.description
-
-    private fun prepareSubstitution(default: String): List<String> = listOf(argument.value, default)
-
-    override val oldSubstitution: List<String>
-        get() = prepareSubstitution(oldDefault)
-    override val newSubstitution: List<String>
-        get() = prepareSubstitution(newDefault)
-
-    override fun isSubstitutable(args: List<String>): Boolean = argument.value !in args
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/AbstractIncrementalCache.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/AbstractIncrementalCache.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.incremental
 import com.intellij.util.io.EnumeratorStringDescriptor
 import org.jetbrains.kotlin.incremental.storage.*
 import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.Flags
 import org.jetbrains.kotlin.metadata.deserialization.NameResolver
 import org.jetbrains.kotlin.metadata.deserialization.TypeTable
 import org.jetbrains.kotlin.metadata.deserialization.supertypes
@@ -35,77 +34,59 @@ interface IncrementalCacheCommon {
    val thisWithDependentCaches: Iterable<AbstractIncrementalCache<*>>
    fun classesFqNamesBySources(files: Iterable<File>): Collection<FqName>
    fun getSubtypesOf(className: FqName): Sequence<FqName>
-    fun getSupertypesOf(className: FqName): Sequence<FqName>
    fun getSourceFileIfClass(fqName: FqName): File?
    fun markDirty(removedAndCompiledSources: Collection<File>)
    fun clearCacheForRemovedClasses(changesCollector: ChangesCollector)
-    fun getComplementaryFilesRecursive(dirtyFiles: Collection<File>): Collection<File>
-    fun updateComplementaryFiles(dirtyFiles: Collection<File>, expectActualTracker: ExpectActualTrackerImpl)
+    fun clearComplementaryFilesMapping(dirtyFiles: Collection<File>): Collection<File>
+    fun registerComplementaryFiles(expectActualTracker: ExpectActualTrackerImpl)
    fun dump(): String
-
-    fun isSealed(className: FqName): Boolean?
 }

 /**
 * Incremental cache common for JVM and JS for specifit ClassName type
 */
-abstract class AbstractIncrementalCache<ClassName>(
-    workingDir: File,
-    protected val pathConverter: FileToPathConverter
-) : BasicMapsOwner(workingDir), IncrementalCacheCommon {
+abstract class AbstractIncrementalCache<ClassName>(workingDir: File) : BasicMapsOwner(workingDir), IncrementalCacheCommon {
    companion object {
-        private val CLASS_ATTRIBUTES = "class-attributes"
        private val SUBTYPES = "subtypes"
        private val SUPERTYPES = "supertypes"
        private val CLASS_FQ_NAME_TO_SOURCE = "class-fq-name-to-source"
        private val COMPLEMENTARY_FILES = "complementary-files"
-        @JvmStatic
-        protected val SOURCE_TO_CLASSES = "source-to-classes"
-        @JvmStatic
-        protected val DIRTY_OUTPUT_CLASSES = "dirty-output-classes"
+        @JvmStatic protected val SOURCE_TO_CLASSES = "source-to-classes"
+        @JvmStatic protected val DIRTY_OUTPUT_CLASSES = "dirty-output-classes"
    }

    private val dependents = arrayListOf<AbstractIncrementalCache<ClassName>>()
    fun addDependentCache(cache: AbstractIncrementalCache<ClassName>) {
        dependents.add(cache)
    }
-
    override val thisWithDependentCaches: Iterable<AbstractIncrementalCache<ClassName>> by lazy {
        val result = arrayListOf(this)
        result.addAll(dependents)
        result
    }

-    internal val classAttributesMap = registerMap(ClassAttributesMap(CLASS_ATTRIBUTES.storageFile))
    private val subtypesMap = registerMap(SubtypesMap(SUBTYPES.storageFile))
    private val supertypesMap = registerMap(SupertypesMap(SUPERTYPES.storageFile))
-    protected val classFqNameToSourceMap = registerMap(ClassFqNameToSourceMap(CLASS_FQ_NAME_TO_SOURCE.storageFile, pathConverter))
+    protected val classFqNameToSourceMap = registerMap(ClassFqNameToSourceMap(CLASS_FQ_NAME_TO_SOURCE.storageFile))
    internal abstract val sourceToClassesMap: AbstractSourceToOutputMap<ClassName>
    internal abstract val dirtyOutputClassesMap: AbstractDirtyClassesMap<ClassName>
+
    /**
     * A file X is a complementary to a file Y if they contain corresponding expect/actual declarations.
     * Complementary files should be compiled together during IC so the compiler does not complain
     * about missing parts.
     * TODO: provide a better solution (maintain an index of expect/actual declarations akin to IncrementalPackagePartProvider)
     */
-    private val complementaryFilesMap = registerMap(ComplementarySourceFilesMap(COMPLEMENTARY_FILES.storageFile, pathConverter))
+    private val complementaryFilesMap = registerMap(FilesMap(COMPLEMENTARY_FILES.storageFile))

    override fun classesFqNamesBySources(files: Iterable<File>): Collection<FqName> =
        files.flatMapTo(HashSet()) { sourceToClassesMap.getFqNames(it) }

    override fun getSubtypesOf(className: FqName): Sequence<FqName> =
-        subtypesMap[className].asSequence()
-
-    override fun getSupertypesOf(className: FqName): Sequence<FqName> {
-        return supertypesMap[className].asSequence()
-    }
-
-    override fun isSealed(className: FqName): Boolean? {
-        return classAttributesMap[className]?.isSealed
-    }
+            subtypesMap[className].asSequence()

    override fun getSourceFileIfClass(fqName: FqName): File? =
-        classFqNameToSourceMap[fqName]
+            classFqNameToSourceMap[fqName]

    override fun markDirty(removedAndCompiledSources: Collection<File>) {
        for (sourceFile in removedAndCompiledSources) {
@@ -121,8 +102,8 @@ abstract class AbstractIncrementalCache<ClassName>(
    protected fun addToClassStorage(proto: ProtoBuf.Class, nameResolver: NameResolver, srcFile: File) {
        val supertypes = proto.supertypes(TypeTable(proto.typeTable))
        val parents = supertypes.map { nameResolver.getClassId(it.className).asSingleFqName() }
-            .filter { it.asString() != "kotlin.Any" }
-            .toSet()
+                .filter { it.asString() != "kotlin.Any" }
+                .toSet()
        val child = nameResolver.getClassId(proto.fqName).asSingleFqName()

        parents.forEach { subtypesMap.add(it, child) }
@@ -132,7 +113,6 @@ abstract class AbstractIncrementalCache<ClassName>(

        supertypesMap[child] = parents
        classFqNameToSourceMap[child] = srcFile
-        classAttributesMap[child] = ICClassesAttributes(ProtoBuf.Modality.SEALED == Flags.MODALITY.get(proto.flags))
    }

    protected fun removeAllFromClassStorage(removedClasses: Collection<FqName>, changesCollector: ChangesCollector) {
@@ -167,23 +147,16 @@ abstract class AbstractIncrementalCache<ClassName>(
            }
        }

-        removedFqNames.forEach {
-            classFqNameToSourceMap.remove(it)
-            classAttributesMap.remove(it)
-        }
+        removedFqNames.forEach { classFqNameToSourceMap.remove(it) }
    }

-    protected class ClassFqNameToSourceMap(
-        storageFile: File,
-        private val pathConverter: FileToPathConverter
-    ) : BasicStringMap<String>(storageFile, EnumeratorStringDescriptor(), PathStringDescriptor) {
-
+    protected class ClassFqNameToSourceMap(storageFile: File) : BasicStringMap<String>(storageFile, EnumeratorStringDescriptor(), PathStringDescriptor) {
        operator fun set(fqName: FqName, sourceFile: File) {
-            storage[fqName.asString()] = pathConverter.toPath(sourceFile)
+            storage[fqName.asString()] = sourceFile.canonicalPath
        }

        operator fun get(fqName: FqName): File? =
-            storage[fqName.asString()]?.let(pathConverter::toFile)
+                storage[fqName.asString()]?.let(::File)

        fun remove(fqName: FqName) {
            storage.remove(fqName.asString())
@@ -192,24 +165,18 @@ abstract class AbstractIncrementalCache<ClassName>(
        override fun dumpValue(value: String) = value
    }

-    override fun getComplementaryFilesRecursive(dirtyFiles: Collection<File>): Collection<File> {
+    override fun clearComplementaryFilesMapping(dirtyFiles: Collection<File>): Collection<File> {
        val complementaryFiles = HashSet<File>()
        val filesQueue = ArrayDeque(dirtyFiles)
        while (filesQueue.isNotEmpty()) {
            val file = filesQueue.pollFirst()
-            complementaryFilesMap[file].forEach {
-                if (complementaryFiles.add(it)) filesQueue.add(it)
-            }
+            complementaryFilesMap.remove(file).filterTo(filesQueue) { complementaryFiles.add(it) }
        }
        complementaryFiles.removeAll(dirtyFiles)
        return complementaryFiles
    }

-    override fun updateComplementaryFiles(dirtyFiles: Collection<File>, expectActualTracker: ExpectActualTrackerImpl) {
-        dirtyFiles.forEach {
-            complementaryFilesMap.remove(it)
-        }
-
+    override fun registerComplementaryFiles(expectActualTracker: ExpectActualTrackerImpl) {
        val actualToExpect = hashMapOf<File, MutableSet<File>>()
        for ((expect, actuals) in expectActualTracker.expectToActualMap) {
            for (actual in actuals) {
--- a/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
@@ -0,0 +1,111 @@
+/*
+ * 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.metadata.jvm.deserialization.JvmBytecodeBinaryVersion
+import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
+import java.io.File
+import java.io.IOException
+
+private val NORMAL_VERSION = 9
+private val DATA_CONTAINER_VERSION = 3
+
+private val NORMAL_VERSION_FILE_NAME = "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,
+        private val isEnabled: Boolean
+) {
+
+    private val actualVersion: Int?
+        get() = try {
+            versionFile.readText().toInt()
+        }
+        catch (e: NumberFormatException) {
+            null
+        }
+        catch (e: IOException) {
+            null
+        }
+
+    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_DATA_CONTAINER,
+        DO_NOTHING
+    }
+}
+
+fun normalCacheVersion(dataRoot: File, enabled: Boolean): 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 = enabled)
+
+fun dataContainerCacheVersion(dataRoot: File, enabled: Boolean): 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 = enabled)
--- a/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt
@@ -19,14 +19,12 @@ package org.jetbrains.kotlin.incremental
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.Flags
 import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.metadata.deserialization.supertypes
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.serialization.deserialization.getClassId

 class ChangesCollector {
    private val removedMembers = hashMapOf<FqName, MutableSet<String>>()
-    private val changedParents = hashMapOf<FqName, MutableSet<FqName>>()
    private val changedMembers = hashMapOf<FqName, MutableSet<String>>()
    private val areSubclassesAffected = hashMapOf<FqName, Boolean>()

@@ -49,10 +47,6 @@ class ChangesCollector {
            changes.add(ChangeInfo.SignatureChanged(fqName, areSubclassesAffected))
        }

-        for ((fqName, changedParents) in changedParents) {
-            changes.add(ChangeInfo.ParentsChanged(fqName, changedParents))
-        }
-
        return changes
    }

@@ -85,12 +79,12 @@ class ChangesCollector {
        }

        if (oldData == null) {
-            newData!!.collectAll(isRemoved = false, isAdded = true, collectAllMembersForNewClass = collectAllMembersForNewClass)
+            newData!!.collectAll(isRemoved = false, collectAllMembersForNewClass = collectAllMembersForNewClass)
            return
        }

        if (newData == null) {
-            oldData.collectAll(isRemoved = true, isAdded = false)
+            oldData.collectAll(isRemoved = true)
            return
        }

@@ -104,7 +98,6 @@ class ChangesCollector {
                            collectSignature(oldData, diff.areSubclassesAffected)
                        }
                        collectChangedMembers(fqName, diff.changedMembersNames)
-                        addChangedParents(fqName, diff.changedSupertypes)
                    }
                    is PackagePartProtoData -> {
                        collectSignature(oldData, areSubclassesAffected = true)
@@ -128,11 +121,10 @@ class ChangesCollector {
    private fun <T> T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List<MessageLite>): Set<String> =
            members.flatMap { this.it().filterNot { it.isPrivate }.names(nameResolver) }.toSet()

-    //TODO remember all sealed parent classes
-    private fun ProtoData.collectAll(isRemoved: Boolean, isAdded: Boolean, collectAllMembersForNewClass: Boolean = false) =
+    private fun ProtoData.collectAll(isRemoved: Boolean, collectAllMembersForNewClass: Boolean = false) =
        when (this) {
            is PackagePartProtoData -> collectAllFromPackage(isRemoved)
-            is ClassProtoData -> collectAllFromClass(isRemoved, isAdded, collectAllMembersForNewClass)
+            is ClassProtoData -> collectAllFromClass(isRemoved, collectAllMembersForNewClass)
        }

    private fun PackagePartProtoData.collectAllFromPackage(isRemoved: Boolean) {
@@ -151,7 +143,7 @@ class ChangesCollector {
        }
    }

-    private fun ClassProtoData.collectAllFromClass(isRemoved: Boolean, isAdded: Boolean, collectAllMembersForNewClass: Boolean = false) {
+    private fun ClassProtoData.collectAllFromClass(isRemoved: Boolean, collectAllMembersForNewClass: Boolean = false) {
        val classFqName = nameResolver.getClassId(proto.fqName).asSingleFqName()
        val kind = Flags.CLASS_KIND.get(proto.flags)

@@ -170,23 +162,6 @@ class ChangesCollector {

            collectSignature(classFqName, areSubclassesAffected = true)
        }
-
-        if (isRemoved || isAdded) {
-            collectChangedParents(classFqName, proto.supertypeList)
-        }
-    }
-
-    private fun addChangedParents(fqName: FqName, parents: Collection<FqName>) {
-        if (parents.isNotEmpty()) {
-            changedParents.getOrPut(fqName) { HashSet() }.addAll(parents)
-        }
-    }
-
-    private fun ClassProtoData.collectChangedParents(fqName: FqName, parents: Collection<ProtoBuf.Type>) {
-        val changedParentsFqNames = parents.map { type ->
-            nameResolver.getClassId(type.className).asSingleFqName()
-        }
-        addChangedParents(fqName, changedParentsFqNames)
    }

    private fun ClassProtoData.getNonPrivateMemberNames(): Set<String> {
--- a/build-common/src/org/jetbrains/kotlin/incremental/ExpectActualTrackerImpl.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ExpectActualTrackerImpl.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.incremental
--- a/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
@@ -0,0 +1,34 @@
+/*
+ * 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.cli.common.ExitCode
+import java.io.File
+
+interface ICReporter {
+    fun report(message: () -> String)
+
+    // used in Gradle plugin
+    @Suppress("unused")
+    fun reportCompileIteration(sourceFiles: Collection<File>, exitCode: ExitCode) {}
+
+    fun pathsAsString(files: Iterable<File>): String =
+            files.joinToString { it.canonicalPath }
+
+    fun pathsAsString(vararg files: File): String =
+            pathsAsString(files.toList())
+}
--- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt
@@ -18,9 +18,11 @@ package org.jetbrains.kotlin.incremental

 import com.intellij.util.io.DataExternalizer
 import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumerImpl
-import org.jetbrains.kotlin.incremental.js.IrTranslationResultValue
 import org.jetbrains.kotlin.incremental.js.TranslationResultValue
-import org.jetbrains.kotlin.incremental.storage.*
+import org.jetbrains.kotlin.incremental.storage.BasicStringMap
+import org.jetbrains.kotlin.incremental.storage.DirtyClassesFqNameMap
+import org.jetbrains.kotlin.incremental.storage.SourceToFqNameMap
+import org.jetbrains.kotlin.incremental.storage.StringToLongMapExternalizer
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
 import org.jetbrains.kotlin.metadata.deserialization.getExtensionOrNull
@@ -28,38 +30,25 @@ import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.name.parentOrNull
-import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
-import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
 import java.io.DataInput
 import java.io.DataOutput
 import java.io.File

-open class IncrementalJsCache(
-    cachesDir: File,
-    pathConverter: FileToPathConverter,
-    serializerProtocol: SerializerExtensionProtocol
-) : AbstractIncrementalCache<FqName>(cachesDir, pathConverter) {
+open class IncrementalJsCache(cachesDir: File) : AbstractIncrementalCache<FqName>(cachesDir) {
    companion object {
-        private const val TRANSLATION_RESULT_MAP = "translation-result"
-        private const val IR_TRANSLATION_RESULT_MAP = "ir-translation-result"
-        private const val INLINE_FUNCTIONS = "inline-functions"
-        private const val HEADER_FILE_NAME = "header.meta"
-        private const val PACKAGE_META_FILE = "packages-meta"
+        private val TRANSLATION_RESULT_MAP = "translation-result"
+        private val INLINE_FUNCTIONS = "inline-functions"
+        private val HEADER_FILE_NAME = "header.meta"

        fun hasHeaderFile(cachesDir: File) = File(cachesDir, HEADER_FILE_NAME).exists()
    }

-    private val protoData = ProtoDataProvider(serializerProtocol)
-
-    override val sourceToClassesMap = registerMap(SourceToFqNameMap(SOURCE_TO_CLASSES.storageFile, pathConverter))
+    override val sourceToClassesMap = registerMap(SourceToFqNameMap(SOURCE_TO_CLASSES.storageFile))
    override val dirtyOutputClassesMap = registerMap(DirtyClassesFqNameMap(DIRTY_OUTPUT_CLASSES.storageFile))
-    private val translationResults = registerMap(TranslationResultMap(TRANSLATION_RESULT_MAP.storageFile, pathConverter, protoData))
-    private val irTranslationResults = registerMap(IrTranslationResultMap(IR_TRANSLATION_RESULT_MAP.storageFile, pathConverter))
-    private val inlineFunctions = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile, pathConverter))
-    private val packageMetadata = registerMap(PackageMetadataMap(PACKAGE_META_FILE.storageFile))
+    private val translationResults = registerMap(TranslationResultMap(TRANSLATION_RESULT_MAP.storageFile))
+    private val inlineFunctions = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile))

    private val dirtySources = hashSetOf<File>()

@@ -74,36 +63,19 @@ open class IncrementalJsCache(
        }

    override fun markDirty(removedAndCompiledSources: Collection<File>) {
-        removedAndCompiledSources.forEach { sourceFile ->
-            // The common prefix of all FQN parents has to be the file package
-            sourceToClassesMap[sourceFile].map { it.parentOrNull()?.asString() ?: "" }.minByOrNull { it.length }?.let {
-                packageMetadata.remove(it)
-            }
-        }
        super.markDirty(removedAndCompiledSources)
        dirtySources.addAll(removedAndCompiledSources)
    }

-    fun compare(translatedFiles: Map<File, TranslationResultValue>, changesCollector: ChangesCollector) {
-        for ((srcFile, data) in translatedFiles) {
-            val oldProtoMap = translationResults[srcFile]?.metadata?.let { protoData(srcFile, it) } ?: emptyMap()
-            val newProtoMap = protoData(srcFile, data.metadata)
-
-            for (classId in oldProtoMap.keys + newProtoMap.keys) {
-                changesCollector.collectProtoChanges(oldProtoMap[classId], newProtoMap[classId])
-            }
-        }
-    }
-
    fun compareAndUpdate(incrementalResults: IncrementalResultsConsumerImpl, changesCollector: ChangesCollector) {
        val translatedFiles = incrementalResults.packageParts

        for ((srcFile, data) in translatedFiles) {
            dirtySources.remove(srcFile)
-            val (binaryMetadata, binaryAst, inlineData) = data
+            val (binaryMetadata, binaryAst) = data

-            val oldProtoMap = translationResults[srcFile]?.metadata?.let { protoData(srcFile, it) } ?: emptyMap()
-            val newProtoMap = protoData(srcFile, binaryMetadata)
+            val oldProtoMap = translationResults[srcFile]?.metadata?.let { getProtoData(srcFile, it) } ?: emptyMap()
+            val newProtoMap = getProtoData(srcFile, binaryMetadata)

            for ((classId, protoData) in newProtoMap) {
                registerOutputForFile(srcFile, classId.asSingleFqName())
@@ -117,21 +89,12 @@ open class IncrementalJsCache(
                changesCollector.collectProtoChanges(oldProtoMap[classId], newProtoMap[classId])
            }

-            translationResults.put(srcFile, binaryMetadata, binaryAst, inlineData)
+            translationResults.put(srcFile, binaryMetadata, binaryAst)
        }

        for ((srcFile, inlineDeclarations) in incrementalResults.inlineFunctions) {
            inlineFunctions.process(srcFile, inlineDeclarations, changesCollector)
        }
-
-        for ((packageName, metadata) in incrementalResults.packageMetadata) {
-            packageMetadata.put(packageName, metadata)
-        }
-
-        for ((srcFile, irData) in incrementalResults.irFileData) {
-            val (fileData, types, signatures, strings, declarations, bodies, fqn) = irData
-            irTranslationResults.put(srcFile, fileData, types, signatures, strings, declarations, bodies, fqn)
-        }
    }

    private fun registerOutputForFile(srcFile: File, name: FqName) {
@@ -142,7 +105,6 @@ open class IncrementalJsCache(
    override fun clearCacheForRemovedClasses(changesCollector: ChangesCollector) {
        dirtySources.forEach {
            translationResults.remove(it, changesCollector)
-            irTranslationResults.remove(it)
            inlineFunctions.remove(it)
        }
        removeAllFromClassStorage(dirtyOutputClassesMap.getDirtyOutputClasses(), changesCollector)
@@ -151,30 +113,14 @@ open class IncrementalJsCache(
    }

    fun nonDirtyPackageParts(): Map<File, TranslationResultValue> =
-        hashMapOf<File, TranslationResultValue>().apply {
-            for (file in translationResults.keys()) {
-
-                if (file !in dirtySources) {
-                    put(file, translationResults[file]!!)
+            hashMapOf<File, TranslationResultValue>().apply {
+                for (path in translationResults.keys()) {
+                    val file = File(path)
+                    if (file !in dirtySources) {
+                        put(file, translationResults[path]!!)
+                    }
                }
            }
-        }
-
-    fun packageMetadata(): Map<String, ByteArray> = hashMapOf<String, ByteArray>().apply {
-        for (fqNameString in packageMetadata.keys()) {
-            put(fqNameString, packageMetadata[fqNameString]!!)
-        }
-    }
-
-    fun nonDirtyIrParts(): Map<File, IrTranslationResultValue> =
-        hashMapOf<File, IrTranslationResultValue>().apply {
-            for (file in irTranslationResults.keys()) {
-
-                if (file !in dirtySources) {
-                    put(file, irTranslationResults[file]!!)
-                }
-            }
-        }
 }

 private object TranslationResultValueExternalizer : DataExternalizer<TranslationResultValue> {
@@ -184,9 +130,6 @@ private object TranslationResultValueExternalizer : DataExternalizer<Translation

        output.writeInt(value.binaryAst.size)
        output.write(value.binaryAst)
-
-        output.writeInt(value.inlineData.size)
-        output.write(value.inlineData)
    }

    override fun read(input: DataInput): TranslationResultValue {
@@ -198,145 +141,39 @@ private object TranslationResultValueExternalizer : DataExternalizer<Translation
        val binaryAst = ByteArray(binaryAstSize)
        input.readFully(binaryAst)

-        val inlineDataSize = input.readInt()
-        val inlineData = ByteArray(inlineDataSize)
-        input.readFully(inlineData)
-
-        return TranslationResultValue(metadata = metadata, binaryAst = binaryAst, inlineData = inlineData)
+        return TranslationResultValue(metadata = metadata, binaryAst = binaryAst)
    }
 }

-private class TranslationResultMap(
-    storageFile: File,
-    private val pathConverter: FileToPathConverter,
-    private val protoData: ProtoDataProvider
-) :
-    BasicStringMap<TranslationResultValue>(storageFile, TranslationResultValueExternalizer) {
+private class TranslationResultMap(storageFile: File) : BasicStringMap<TranslationResultValue>(storageFile, TranslationResultValueExternalizer) {
    override fun dumpValue(value: TranslationResultValue): String =
-        "Metadata: ${value.metadata.md5()}, Binary AST: ${value.binaryAst.md5()}, InlineData: ${value.inlineData.md5()}"
+            "Metadata: ${value.metadata.md5()}, Binary AST: ${value.binaryAst.md5()}"

-    fun put(sourceFile: File, newMetadata: ByteArray, newBinaryAst: ByteArray, newInlineData: ByteArray) {
-        storage[pathConverter.toPath(sourceFile)] =
-            TranslationResultValue(metadata = newMetadata, binaryAst = newBinaryAst, inlineData = newInlineData)
+    fun put(file: File, newMetadata: ByteArray, newBinaryAst: ByteArray) {
+        storage[file.canonicalPath] = TranslationResultValue(metadata = newMetadata, binaryAst = newBinaryAst)
    }

-    operator fun get(sourceFile: File): TranslationResultValue? =
-        storage[pathConverter.toPath(sourceFile)]
+    operator fun get(file: File): TranslationResultValue? =
+            storage[file.canonicalPath]

-    fun keys(): Collection<File> =
-        storage.keys.map { pathConverter.toFile(it) }
+    operator fun get(key: String): TranslationResultValue? =
+            storage[key]

-    fun remove(sourceFile: File, changesCollector: ChangesCollector) {
-        val path = pathConverter.toPath(sourceFile)
-        val protoBytes = storage[path]!!.metadata
-        val protoMap = protoData(sourceFile, protoBytes)
+    fun keys(): Collection<String> =
+            storage.keys
+
+    fun remove(file: File, changesCollector: ChangesCollector) {
+        val protoBytes = storage[file.canonicalPath]!!.metadata
+        val protoMap = getProtoData(file, protoBytes)

        for ((_, protoData) in protoMap) {
            changesCollector.collectProtoChanges(oldData = protoData, newData = null)
        }
-        storage.remove(path)
+        storage.remove(file.canonicalPath)
    }
 }

-private object IrTranslationResultValueExternalizer : DataExternalizer<IrTranslationResultValue> {
-    override fun save(output: DataOutput, value: IrTranslationResultValue) {
-        output.writeArray(value.fileData)
-        output.writeArray(value.types)
-        output.writeArray(value.signatures)
-        output.writeArray(value.strings)
-        output.writeArray(value.declarations)
-        output.writeArray(value.bodies)
-        output.writeArray(value.fqn)
-    }
-
-    private fun DataOutput.writeArray(array: ByteArray) {
-        writeInt(array.size)
-        write(array)
-    }
-
-    private fun DataInput.readArray(): ByteArray {
-        val dataSize = readInt()
-        val filedata = ByteArray(dataSize)
-        readFully(filedata)
-        return filedata
-    }
-
-    override fun read(input: DataInput): IrTranslationResultValue {
-        val fileData = input.readArray()
-        val types = input.readArray()
-        val signatures = input.readArray()
-        val strings = input.readArray()
-        val declarations = input.readArray()
-        val bodies = input.readArray()
-        val fqn = input.readArray()
-
-        return IrTranslationResultValue(fileData, types, signatures, strings, declarations, bodies, fqn)
-    }
-}
-
-private class IrTranslationResultMap(
-    storageFile: File,
-    private val pathConverter: FileToPathConverter
-) :
-    BasicStringMap<IrTranslationResultValue>(storageFile, IrTranslationResultValueExternalizer) {
-    override fun dumpValue(value: IrTranslationResultValue): String =
-        "Filedata: ${value.fileData.md5()}, " +
-                "Types: ${value.types.md5()}, " +
-                "Signatures: ${value.signatures.md5()}, " +
-                "Strings: ${value.strings.md5()}, " +
-                "Declarations: ${value.declarations.md5()}, " +
-                "Bodies: ${value.bodies.md5()}"
-
-    fun put(
-        sourceFile: File,
-        newFiledata: ByteArray,
-        newTypes: ByteArray,
-        newSignatures: ByteArray,
-        newStrings: ByteArray,
-        newDeclarations: ByteArray,
-        newBodies: ByteArray,
-        fqn: ByteArray
-    ) {
-        storage[pathConverter.toPath(sourceFile)] =
-            IrTranslationResultValue(newFiledata, newTypes, newSignatures, newStrings, newDeclarations, newBodies, fqn)
-    }
-
-    operator fun get(sourceFile: File): IrTranslationResultValue? =
-        storage[pathConverter.toPath(sourceFile)]
-
-    fun keys(): Collection<File> =
-        storage.keys.map { pathConverter.toFile(it) }
-
-    fun remove(sourceFile: File) {
-        val path = pathConverter.toPath(sourceFile)
-        storage.remove(path)
-    }
-}
-
-private class ProtoDataProvider(private val serializerProtocol: SerializerExtensionProtocol) {
-    operator fun invoke(sourceFile: File, metadata: ByteArray): Map<ClassId, ProtoData> {
-        val classes = hashMapOf<ClassId, ProtoData>()
-        val proto = ProtoBuf.PackageFragment.parseFrom(metadata, serializerProtocol.extensionRegistry)
-        val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames)
-
-        proto.class_List.forEach {
-            val classId = nameResolver.getClassId(it.fqName)
-            classes[classId] = ClassProtoData(it, nameResolver)
-        }
-
-        proto.`package`.apply {
-            val packageNameId = getExtensionOrNull(serializerProtocol.packageFqName)
-            val packageFqName = packageNameId?.let { FqName(nameResolver.getPackageFqName(it)) } ?: FqName.ROOT
-            val packagePartClassId = ClassId(packageFqName, Name.identifier(sourceFile.nameWithoutExtension.capitalizeAsciiOnly() + "Kt"))
-            classes[packagePartClassId] = PackagePartProtoData(this, nameResolver, packageFqName)
-        }
-
-        return classes
-    }
-}
-
-// TODO: remove this method once AbstractJsProtoComparisonTest is fixed
-fun getProtoData(sourceFile: File, metadata: ByteArray): Map<ClassId, ProtoData> {
+fun getProtoData(sourceFile: File, metadata: ByteArray): Map<ClassId, ProtoData>  {
    val classes = hashMapOf<ClassId, ProtoData>()
    val proto = ProtoBuf.PackageFragment.parseFrom(metadata, JsSerializerProtocol.extensionRegistry)
    val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames)
@@ -348,24 +185,22 @@ fun getProtoData(sourceFile: File, metadata: ByteArray): Map<ClassId, ProtoData>

    proto.`package`.apply {
        val packageFqName = getExtensionOrNull(JsProtoBuf.packageFqName)?.let(nameResolver::getPackageFqName)?.let(::FqName) ?: FqName.ROOT
-        val packagePartClassId = ClassId(packageFqName, Name.identifier(sourceFile.nameWithoutExtension.capitalizeAsciiOnly() + "Kt"))
+        val packagePartClassId = ClassId(packageFqName, Name.identifier(sourceFile.nameWithoutExtension.capitalize() + "Kt"))
        classes[packagePartClassId] = PackagePartProtoData(this, nameResolver, packageFqName)
    }

    return classes
 }

-private class InlineFunctionsMap(
-    storageFile: File,
-    private val pathConverter: FileToPathConverter
-) : BasicStringMap<Map<String, Long>>(storageFile, StringToLongMapExternalizer) {
+private class InlineFunctionsMap(storageFile: File) : BasicStringMap<Map<String, Long>>(storageFile, StringToLongMapExternalizer) {
    fun process(srcFile: File, newMap: Map<String, Long>, changesCollector: ChangesCollector) {
-        val key = pathConverter.toPath(srcFile)
+        val key = srcFile.canonicalPath
        val oldMap = storage[key] ?: emptyMap()

        if (newMap.isNotEmpty()) {
            storage[key] = newMap
-        } else {
+        }
+        else {
            storage.remove(key)
        }

@@ -377,40 +212,9 @@ private class InlineFunctionsMap(
    }

    fun remove(sourceFile: File) {
-        storage.remove(pathConverter.toPath(sourceFile))
+        storage.remove(sourceFile.canonicalPath)
    }

    override fun dumpValue(value: Map<String, Long>): String =
-        value.dumpMap { java.lang.Long.toHexString(it) }
-}
-
-private object ByteArrayExternalizer : DataExternalizer<ByteArray> {
-    override fun save(output: DataOutput, value: ByteArray) {
-        output.writeInt(value.size)
-        output.write(value)
-    }
-
-    override fun read(input: DataInput): ByteArray {
-        val size = input.readInt()
-        val array = ByteArray(size)
-        input.readFully(array)
-        return array
-    }
-}
-
-
-private class PackageMetadataMap(storageFile: File) : BasicStringMap<ByteArray>(storageFile, ByteArrayExternalizer) {
-    fun put(packageName: String, newMetadata: ByteArray) {
-        storage[packageName] = newMetadata
-    }
-
-    fun remove(packageName: String) {
-        storage.remove(packageName)
-    }
-
-    fun keys() = storage.keys
-
-    operator fun get(packageName: String) = storage[packageName]
-
-    override fun dumpValue(value: ByteArray): String = "Package metadata: ${value.md5()}"
-}
+            value.dumpMap { java.lang.Long.toHexString(it) }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ilya Gorbunov	f0eb50fa98	Prepare changelog for plugin update	2018-08-07 17:17:39 +03:00
Simon Ogorodnik	bf2983df26	KT-25733: Fix regression after optimization #KT-25733 fixed (cherry picked from commit `07cc3bd63a`)	2018-08-06 20:37:10 +03:00
Nikolay Krasko	b185828f3c	Fix incompatibility because of KotlinGradleModelFacade change (KT-25713) AndroidGradleModelFacade was moved to android plugin in AS 3.3, so now changes in KotlinGradleModelFacade should be binary compatible. Current fix rewrite KotlinGradleModelFacade to Java because of default methods. Also current implementation abuses the fact that AndroidGradleModelFacade don't use groupId parameter for getting library versions. (cherry picked from commit `2d1fc4b798`) #KT-25713 Fixed	2018-08-03 16:11:59 +03:00
Alexey Sedunov	2426f662ec	Misc: Add bunch files to fix compatibility with AS3.3C4	2018-08-02 20:01:55 +03:00
Ilmir Usmanov	a79f45aed2	Refactoring. Move transformRuntimeFunctionTypeToSuspendFunction to TypeDeserializer (cherry picked from commit `a10bd9f`)	2018-07-26 13:31:17 +03:00
Ilmir Usmanov	2f3080e260	Refactoring. Make DeserializedMemberDescriptor somewhat immutable (cherry picked from commit `533dd44`)	2018-07-26 13:31:01 +03:00
Vyacheslav Gerasimov	2920c782b0	as33c4: Update build range for AS 3.3 plugin to match C4 and further releases	2018-07-25 17:39:53 +03:00
Vyacheslav Gerasimov	40ed1e6230	as32: Update build range for AS 3.2 plugin to match RC1 and further releases	2018-07-25 17:39:43 +03:00
Alexander Udalov	822dc4e997	Fix generic signature of FunctionN type visible from Java	2018-07-24 16:29:47 +02:00
Nikolay Krasko	90f4532b82	Don't delete unresolved imports in cleanup inspection (KT-25678) It looks like they were deleted because of the bug in search for deprecated imports search. (cherry picked from commit `7b6df0a`) #KT-25678 Fixed	2018-07-24 17:14:24 +03:00
Mikhail Glukhikh	c7f004ced4	1.3 migration: make inspections working for non-experimental coroutines (cherry picked from commit `cc1d9e88d5`)	2018-07-24 17:11:32 +03:00
Ilya Gorbunov	e2a78ef4a5	Add changelog for 1.3-M1	2018-07-24 16:14:32 +03:00
Alexey Tsvetkov	499c850777	Minor: fix 173 patchset	2018-07-24 16:09:39 +03:00
Alexey Tsvetkov	f0ad81a447	Minor: fix 172 patchset	2018-07-24 16:09:16 +03:00
Alexey Tsvetkov	dc810530d8	Report info message when JS IC is enabled in JPS	2018-07-24 16:09:12 +03:00
Alexey Tsvetkov	372961f92e	Add setting to enable JS IC for JPS #KT-25565 fixed	2018-07-24 16:09:06 +03:00
Alexey Tsvetkov	2e80ae8fb7	Use separate system properties to control IC for JVM and JS Also this commit effectively disables JS IC by default #KT-25563 fixed	2018-07-24 16:09:00 +03:00
Vyacheslav Gerasimov	e484775194	Update build range for AS 3.3 plugin to match only AS 3.3 C3	2018-07-24 15:57:26 +03:00
Vyacheslav Gerasimov	b3ad204aba	Update build range for AS 3.2 plugin to match next AS 3.2 releases	2018-07-24 15:57:15 +03:00
Ilya Gorbunov	a7a48c2c04	Fixup: Include new coroutines and unsigned classes into stdlib Add new coroutines sources into sources.jar	2018-07-24 15:05:28 +03:00
Vyacheslav Gerasimov	c681883207	as33c4: Remove registration of AndroidGradleOrderEnumerationHandler from gradle-java.xml	2018-07-24 14:07:13 +03:00
Vyacheslav Gerasimov	14b611def0	as33c4: Fix compatibility with AS 3.3 C4	2018-07-24 11:43:19 +03:00
Vyacheslav Gerasimov	6c7a3dfa64	as33c4: Remove KotlinExplicitMovementProvider.kt compilation fails against git4idea bundled in AS, wrong version probably	2018-07-24 11:43:19 +03:00
Vyacheslav Gerasimov	f22b74364e	as33c4: Update versions for AS 3.3 C4	2018-07-24 11:43:18 +03:00
Vyacheslav Gerasimov	f1dca37cda	as33c4: TEMP Build against AS 3.3 C4	2018-07-24 11:43:18 +03:00
Vyacheslav Gerasimov	8c515c2de4	Add as33c4 bunch derived from 182	2018-07-24 11:43:18 +03:00
Denis Zharkov	e9a33ee2e9	Partially revert `79e776e9d7` It's necessary for preserving external plugin compatibility	2018-07-24 11:28:01 +03:00
Dmitry Petrov	6a38d67e00	Fix ConstantValue-related testData for lightClasses tests TODO support custom language version settings for lightClasses tests	2018-07-24 10:57:48 +03:00
Dmitry Petrov	76d3a3eb83	Fix ConstantValue-related testData for loadJava tests	2018-07-24 10:57:48 +03:00
Ilmir Usmanov	0c6db935b0	Add warning on -Xcoroutines flag use The only case when warning is not reported is -Xcoroutines=default. But this is OK until the flag is removed completely.	2018-07-23 21:55:15 +03:00
Ilmir Usmanov	85e2d4e445	Deserialize experimental coroutines as suspend functions/types but deprecate them for now. Promote stub version. #KT-25623: Fixed	2018-07-23 21:53:52 +03:00
Nikolay Krasko	50270f639b	Add intention for replacing experimental coroutines usages to cleanup (KT-25251) #KT-25251 In Progress (cherry picked from commit `6687081`)	2018-07-23 18:58:23 +03:00
Dmitry Petrov	670e847cd1	Fix ProjectImpl leak in PatternMatchingTypingVisitor	2018-07-23 16:07:24 +03:00
Denis Zharkov	1e3985d660	Restore method broken in `f72aa78eec` Otherwise plugin compatibility tests are failing	2018-07-23 13:39:50 +03:00
Ilya Gorbunov	aea980de20	Add stdlib test for Boolean companion	2018-07-21 02:23:45 +03:00
Ilya Gorbunov	8d1de33efb	Use Char.MIN_VALUE and MAX_VALUE in tests	2018-07-21 02:23:42 +03:00
Ilya Gorbunov	55421b035a	Add tests for SIZE_BYTES and SIZE_BITS constants #KT-8247 Fixed	2018-07-21 02:23:39 +03:00
Ilya Gorbunov	f6948847b2	Add tests for UInt, ULong Opt-in to use unsigned types in tests	2018-07-21 02:23:36 +03:00
Ilya Gorbunov	a145c26071	Switch bootstrap to 1.3 branch, build 1.3-M1-eap-77	2018-07-21 02:23:33 +03:00
Ilya Gorbunov	2f196a3a81	Unignore passing tests with unsigned literals in JS	2018-07-21 02:23:14 +03:00
Mikhail Zarechenskiy	6e64c5fca7	Support other kinds of translation for unsigned literals	2018-07-20 20:38:12 +03:00
Roman Artemev	b496bd3a3a	Fix unsigned constants translation (Int to UInt)	2018-07-20 20:38:09 +03:00
Mikhail Zarechenskiy	1d18821aaf	Initial support of unsigned literals translation in JS	2018-07-20 20:38:06 +03:00
Ilya Gorbunov	62ed64bc00	Generate hashCode and equals for unsigned types	2018-07-20 20:38:02 +03:00
Ilya Gorbunov	2f3b9ecc96	Opt-in to use unsigned types in various internal utils	2018-07-20 20:37:59 +03:00
Ilya Gorbunov	1bd54a9edf	Deprecate js Math.random and provide replacement with Random.nextDouble #KT-23564 Fixed	2018-07-20 20:37:56 +03:00
Dmitry Savvinov	216fd04b29	Disable contracts in 1.3-M1 ^KT-25538 Fixed	2018-07-20 20:37:53 +03:00
Ilya Gorbunov	f7c9438fa8	Allow to skip JS IR tests with gradle property kotlin.compiler.js.ir.tests.skip	2018-07-20 20:37:49 +03:00
Ilya Gorbunov	835971a619	Update expected reachable node count in JS tests Caused by new coroutine API an its js support	2018-07-20 20:37:46 +03:00
Ilya Gorbunov	69d0c08b26	Update expected reachable node count in JS tests Caused by introduction of new random API	2018-07-20 20:37:43 +03:00
Alexander Udalov	c189721d69	Revert "Ignore tests on big function types until master is 1.3" This reverts commit `f03dc62173`.	2018-07-20 20:37:39 +03:00
Alexander Udalov	7581e0f8b8	Introduce kotlin.jvm.functions.FunctionN #KT-13764	2018-07-20 20:37:32 +03:00
Alexander Udalov	9bc4c1320a	Convert FunctionBase to Kotlin, add type parameter to Lambda This will make it possible to avoid raw types when inheriting from both FunctionBase and Function<R>. This change adds a generic type parameter to FunctionBase and Lambda which is not source-breaking under our policy because both FunctionBase and Lambda are internal classes (located in package kotlin.jvm.internal)	2018-07-20 20:37:29 +03:00
Alexander Udalov	f0724f4a3b	Move superinterface to the only subclass of FunctionBase	2018-07-20 20:37:26 +03:00
Ilya Gorbunov	93b8d464ca	Introduce Char.MIN_VALUE and MAX_VALUE constants (KT-21763) Add Char.MIN_VALUE and Char.MAX_VALUE implementations in primitive companion objects. Update builtins test data and public API. Co-authored-by: Oskar Drozda <themppsplx@gmail.com>	2018-07-20 20:37:23 +03:00
Ilya Gorbunov	afd95d7942	Split summary from description in Char docs	2018-07-20 20:37:20 +03:00
Ilya Gorbunov	f9a3c058c7	Introduce SIZE_BYTES and SIZE_BITS constants for all integral types #KT-8247 Fixed	2018-07-20 20:37:16 +03:00
Ilya Gorbunov	19705c7ad6	Annotate companion object declaration with SinceKotlin Move it to the end of the class declaration. Update builtins testdata	2018-07-20 20:37:13 +03:00
Kerooker	3d9c10b6ee	Removed Boolean from ClassMapperLite to avoid compiler confusion	2018-07-20 20:37:09 +03:00
Kerooker	f45f172d4d	KT-7922 Added Boolean Companion Object	2018-07-20 20:37:06 +03:00
Ilya Gorbunov	5264ea9fd3	Improve isNullOrEmpty() extensions - Annotate with SinceKotlin("1.3") and InlineOnly - Add contract linking the receiver and the returned value - Unify wording in docs - Add sample for Map.isNullOrEmpty #KT-23279	2018-07-20 20:37:03 +03:00
Mon_chi	6b98569bd0	Add isNullOrEmpty() to Array, Collection, and Map. Fixes KT-23279	2018-07-20 20:37:00 +03:00
Jeff Wright	54212c7023	Add Collections.isNullOrEmpty #KT-23279	2018-07-20 20:36:57 +03:00
Toshiaki Kameyama	63d5186a66	"Useless call on collection type" inspection: Apply to 'kotlin.sequences.orEmpty'	2018-07-20 20:36:53 +03:00
Toshiaki Kameyama	31c2dfee3c	Add Sequence.orEmpty #KT-16552 Fixed	2018-07-20 20:36:50 +03:00
Ilya Gorbunov	f7337cc9fc	Make bound check helpers top-level so they are compiled as static on JVM Improve empty range exception text in nextInt/nextLong(range)	2018-07-20 20:36:47 +03:00
Ilya Gorbunov	22402b70f8	More efficient double generation in JS	2018-07-20 20:36:44 +03:00
Ilya Gorbunov	d50c4ad862	Write random contract tests and fix implementations to pass them	2018-07-20 20:36:41 +03:00
Ilya Gorbunov	96762a1854	Add xorwow random implementation test and fix implementation	2018-07-20 20:36:37 +03:00
Ilya Gorbunov	fd05ef21fd	Provide ThreadLocalRandom wrapper only on JDK8 as it is buggy in JDK7	2018-07-20 20:36:34 +03:00
Ilya Gorbunov	5d09fe5ae5	Remove lazy initialization of default platform random	2018-07-20 20:36:31 +03:00
Ilya Gorbunov	1c22f25342	Random docs and API refinement KT-17261	2018-07-20 20:36:28 +03:00
Ilya Gorbunov	2d516446cd	Common shuffle/shuffled with the specified random source KT-17261, KT-9010	2018-07-20 20:36:25 +03:00
Ilya Gorbunov	4d51d1343d	Provide common Random API #KT-17261	2018-07-20 20:36:22 +03:00
Ilmir Usmanov	5f886fa5d4	Do not coerce function literals to suspend. The design is to use `suspend fun` instead of coercion, just as suspend lambdas. However, this syntax is not supported in the parser. But this is not a problem, since the coercion lead to internal compiler error. As a workaround everybody uses suspend lambdas. #KT-24860: Fixed	2018-07-20 20:36:19 +03:00
Ilya Gorbunov	e07c8d142a	Migrate stepping and evaluation tests to the new coroutine API	2018-07-20 20:36:16 +03:00
Ilya Gorbunov	c013aa8211	Introduce StringBuilder.clear() extension #KT-18910 Fixed	2018-07-20 20:22:10 +03:00
Ilya Gorbunov	755ea9aae4	Allow pre-release compiler reading pre-release binaries in tests Pre-release compiler should be able to read pre-release binaries in tests even if a stable language version is used, otherwise no stdlib API can be read.	2018-07-20 20:22:06 +03:00
Alexander Udalov	4e4cd252b8	Make kotlin.Metadata public Prohibit explicit usage of `@Metadata` to prevent possible AnnotationFormatError at runtime #KT-23602 Fixed	2018-07-20 20:22:03 +03:00
Ilya Gorbunov	8018be7cb4	For bootstrapping on 1.3-M1: compile parts that can be used in .gradle.kts scripts with 1.2 language version	2018-07-20 20:22:00 +03:00
Ilya Gorbunov	2de412fbb3	Include new coroutines and unsigned classes into stdlib Fix clashing module name in common coroutines sourceset	2018-07-20 20:21:57 +03:00
Ilya Gorbunov	77c2e34201	Update public API test due to ProperVisibilityForCompanionObjectInstanceField	2018-07-20 19:29:57 +03:00
Ilya Gorbunov	d2fba5dfe5	Temporarily turn off ReleaseCoroutines feature	2018-07-20 19:29:55 +03:00
Ilya Gorbunov	27aceee4ea	Advance maven project versions to 1.3-SNAPSHOT	2018-07-20 19:29:52 +03:00
Ilya Gorbunov	c033468783	Advance project version to 1.3-SNAPSHOT Set LATEST_STABLE language version and current version of stdlib to 1.3, set IS_PRE_RELEASE Remove "EXPERIMENTAL" from 1.3 version description in tests and gradle options	2018-07-20 19:29:50 +03:00