IR: add module ir.tree.impl, move main IR implementation there

build.gradle.kts

@@ -229,6 +229,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:frontend.java",
     ":compiler:cli-common",
     ":compiler:ir.tree",
+    ":compiler:ir.tree.impl",
     ":compiler:ir.tree.persistent",
     ":compiler:ir.psi2ir",
     ":compiler:ir.backend.common",

compiler/cli/build.gradle.kts

@@ -31,6 +31,9 @@ dependencies {
     compile(project(":kotlin-util-io"))
     compile(project(":compiler:ir.serialization.common"))
 
+    // TODO: as soon as cli-jvm is extracted out of this module, move this dependency there
+    compileOnly(project(":compiler:ir.tree.impl"))
+
     compileOnly(toolsJarApi())
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }

compiler/ir/backend.jvm/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     compile(project(":compiler:ir.psi2ir"))
     compile(project(":compiler:ir.backend.common"))
     compile(project(":compiler:ir.serialization.jvm"))
+    compileOnly(project(":compiler:ir.tree.impl"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
     compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) }
 }

compiler/ir/ir.tree.impl/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(project(":compiler:ir.tree"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}

compiler/tests-common/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:tests-mutes"))
     testCompile(project(":compiler:backend"))
+    testCompile(project(":compiler:ir.tree.impl"))
     testCompile(project(":compiler:fir:tree"))
     testCompile(project(":compiler:fir:raw-fir:psi2fir"))
     testCompile(project(":compiler:fir:raw-fir:light-tree2fir"))

generators/build.gradle.kts

@@ -33,6 +33,7 @@ dependencies {
     builtinsApi("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") { isTransitive = false }
     evaluateApi(project(":core:deserialization"))
     interpreterApi(project(":compiler:ir.tree"))
+    interpreterApi(project(":compiler:ir.tree.impl"))
 
     testCompile(builtinsSourceSet.output)
     testCompile(evaluateSourceSet.output)

libraries/scripting/js-test/build.gradle.kts

@@ -1,4 +1,3 @@
-
 plugins {
     kotlin("jvm")
 }
@@ -13,6 +12,7 @@ dependencies {
     testCompile(project(":kotlin-scripting-compiler"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:backend.js"))
+    testCompile(project(":compiler:ir.tree.impl"))
     testCompile(project(":js:js.engines"))
     testCompile(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }

plugins/android-extensions/android-extensions-compiler/build.gradle.kts

@@ -19,6 +19,7 @@ dependencies {
     compileOnly(project(":compiler:backend"))
     compileOnly(project(":compiler:ir.backend.common"))
     compileOnly(project(":compiler:backend.jvm"))
+    compileOnly(project(":compiler:ir.tree.impl"))
     compileOnly(project(":kotlin-android-extensions-runtime"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }

plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts

@@ -14,6 +14,7 @@ dependencies {
     compileOnly(project(":compiler:backend"))
     compileOnly(project(":compiler:ir.backend.common"))
     compileOnly(project(":compiler:ir.psi2ir"))
+    compileOnly(project(":compiler:ir.tree.impl"))
     compileOnly(project(":js:js.frontend"))
     compileOnly(project(":js:js.translator"))
     compileOnly(project(":kotlin-util-klib-metadata"))

plugins/scripting/scripting-compiler/build.gradle.kts

@@ -14,6 +14,7 @@ dependencies {
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":compiler:backend.js"))
     compileOnly(project(":core:descriptors.runtime"))
+    compileOnly(project(":compiler:ir.tree.impl"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-js"))
     compile(project(":kotlin-util-klib"))

prepare/idea-plugin/build.gradle.kts

@@ -62,7 +62,7 @@ val projectsToShadow by extra(listOf(
         ":idea:idea-gradle-native",
         ":compiler:ir.psi2ir",
         ":compiler:ir.tree",
-        ":compiler:ir.tree.persistent",
+        ":compiler:ir.tree.impl",
         ":js:js.ast",
         ":js:js.frontend",
         ":js:js.parser",

settings.gradle

@@ -107,6 +107,7 @@ include ":benchmarks",
         ":kotlin-compiler-runner",
         ":compiler:cli-common",
         ":compiler:ir.tree",
+        ":compiler:ir.tree.impl",
         ":compiler:ir.tree.persistent",
         ":compiler:ir.psi2ir",
         ":compiler:ir.ir2cfg",
@@ -445,6 +446,7 @@ project(':kotlin-daemon-tests').projectDir = "$rootDir/compiler/daemon/daemon-te
 project(':kotlin-compiler-runner').projectDir = "$rootDir/compiler/compiler-runner" as File
 project(':kotlin-ant').projectDir = "$rootDir/ant" as File
 project(':compiler:ir.tree').projectDir = "$rootDir/compiler/ir/ir.tree" as File
+project(':compiler:ir.tree.impl').projectDir = "$rootDir/compiler/ir/ir.tree.impl" as File
 project(':compiler:ir.tree.persistent').projectDir = "$rootDir/compiler/ir/ir.tree.persistent" as File
 project(':compiler:ir.psi2ir').projectDir = "$rootDir/compiler/ir/ir.psi2ir" as File
 project(':compiler:ir.ir2cfg').projectDir = "$rootDir/compiler/ir/ir.ir2cfg" as File