From a95375cd9fbaafca959ed0dff52367e05b25b00b Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Wed, 15 Sep 2021 01:48:16 +0200
Subject: [PATCH] JVM IR: extract separate module backend.jvm.codegen

The main benefit is that now lowerings and codegen are compiled in
parallel, which speeds up the build. Hopefully, this will also improve
incremental compilation in case of implementation changes because the
rest of the compiler (cli & tests) has no "api" dependency on lowerings
and codegen.
---
 build.gradle.kts                              |  1 +
 compiler/ir/backend.jvm/build.gradle.kts      |  3 +--
 .../ir/backend.jvm/codegen/build.gradle.kts   | 19 +++++++++++++++++++
 .../backend/jvm/codegen/AnnotationCodegen.kt  |  0
 .../backend/jvm/codegen/ClassCodegen.kt       |  0
 .../backend/jvm/codegen/CoroutineCodegen.kt   |  0
 .../backend/jvm/codegen/ExpressionCodegen.kt  |  0
 .../backend/jvm/codegen/FunctionCodegen.kt    |  0
 .../backend/jvm/codegen/IrCallGenerator.kt    |  0
 .../jvm/codegen/IrInlineCallGenerator.kt      |  0
 .../backend/jvm/codegen/IrInlineCodegen.kt    |  0
 .../jvm/codegen/IrInlineDefaultCodegen.kt     |  0
 .../jvm/codegen/IrInlineIntrinsicsSupport.kt  |  0
 .../jvm/codegen/IrSourceCompilerForInline.kt  |  0
 .../jvm/codegen/JvmSignatureClashDetector.kt  |  0
 .../backend/jvm/codegen/PromisedValue.kt      |  0
 .../backend/jvm/codegen/SwitchGenerator.kt    |  0
 .../backend/jvm/codegen/irCodegenUtils.kt     |  0
 .../kotlin/backend/jvm/intrinsics/AndAnd.kt   |  0
 .../kotlin/backend/jvm/intrinsics/ArrayGet.kt |  0
 .../backend/jvm/intrinsics/ArrayIterator.kt   |  0
 .../kotlin/backend/jvm/intrinsics/ArraySet.kt |  0
 .../backend/jvm/intrinsics/ArraySize.kt       |  0
 .../kotlin/backend/jvm/intrinsics/BinaryOp.kt |  0
 .../kotlin/backend/jvm/intrinsics/Clone.kt    |  0
 .../backend/jvm/intrinsics/CompareTo.kt       |  0
 .../backend/jvm/intrinsics/EnumIntrinsics.kt  |  0
 .../kotlin/backend/jvm/intrinsics/Equals.kt   |  0
 .../jvm/intrinsics/GetJavaObjectType.kt       |  0
 .../jvm/intrinsics/GetJavaPrimitiveType.kt    |  0
 .../kotlin/backend/jvm/intrinsics/HashCode.kt |  0
 .../backend/jvm/intrinsics/Increment.kt       |  0
 .../backend/jvm/intrinsics/IntrinsicMethod.kt |  0
 .../IntrinsicShouldHaveBeenLowered.kt         |  0
 .../kotlin/backend/jvm/intrinsics/Inv.kt      |  0
 .../backend/jvm/intrinsics/IrCheckNotNull.kt  |  0
 .../IrDataClassArrayMemberHashCode.kt         |  0
 .../IrDataClassArrayMemberToString.kt         |  0
 .../intrinsics/IrIllegalArgumentException.kt  |  0
 .../jvm/intrinsics/IrIntrinsicFunction.kt     |  0
 .../jvm/intrinsics/IrIntrinsicMethods.kt      |  0
 .../IrNoWhenBranchMatchedException.kt         |  0
 .../backend/jvm/intrinsics/IsArrayOf.kt       |  0
 .../backend/jvm/intrinsics/IteratorNext.kt    |  0
 .../jvm/intrinsics/JavaClassProperty.kt       |  0
 .../intrinsics/JvmDebuggerInvokeSpecial.kt    |  0
 .../jvm/intrinsics/JvmInvokeDynamic.kt        |  0
 .../jvm/intrinsics/KClassJavaProperty.kt      |  0
 .../jvm/intrinsics/MonitorInstruction.kt      |  0
 .../kotlin/backend/jvm/intrinsics/NewArray.kt |  0
 .../kotlin/backend/jvm/intrinsics/Not.kt      |  0
 .../backend/jvm/intrinsics/NumberCast.kt      |  0
 .../kotlin/backend/jvm/intrinsics/OrOr.kt     |  0
 .../backend/jvm/intrinsics/PostfixIinc.kt     |  0
 .../kotlin/backend/jvm/intrinsics/RangeTo.kt  |  0
 .../backend/jvm/intrinsics/SignatureString.kt |  0
 .../backend/jvm/intrinsics/StringGetChar.kt   |  0
 .../backend/jvm/intrinsics/StringPlus.kt      |  0
 .../backend/jvm/intrinsics/ThrowIntrinsics.kt |  0
 .../ThrowKotlinNothingValueException.kt       |  0
 .../kotlin/backend/jvm/intrinsics/TypeOf.kt   |  0
 .../backend/jvm/intrinsics/UnaryMinus.kt      |  0
 .../backend/jvm/intrinsics/UnaryPlus.kt       |  0
 .../backend/jvm/intrinsics/UnsafeCoerce.kt    |  0
 .../backend.jvm/entrypoint/build.gradle.kts   |  1 +
 .../backend/jvm/ir/IrJvmFlexibleType.kt       |  2 +-
 .../jvm/mapping/MethodSignatureMapper.kt      |  2 +-
 settings.gradle                               |  2 ++
 68 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 compiler/ir/backend.jvm/codegen/build.gradle.kts
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/IrCallGenerator.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCallGenerator.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCodegen.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineDefaultCodegen.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineIntrinsicsSupport.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/AndAnd.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayGet.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayIterator.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySet.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySize.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/BinaryOp.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Clone.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/EnumIntrinsics.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaObjectType.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaPrimitiveType.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/HashCode.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Increment.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicMethod.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicShouldHaveBeenLowered.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Inv.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrCheckNotNull.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberHashCode.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberToString.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIllegalArgumentException.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicFunction.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrNoWhenBranchMatchedException.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IsArrayOf.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JavaClassProperty.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmDebuggerInvokeSpecial.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmInvokeDynamic.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/KClassJavaProperty.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/MonitorInstruction.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NewArray.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Not.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NumberCast.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/OrOr.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/PostfixIinc.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/RangeTo.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/SignatureString.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringGetChar.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowKotlinNothingValueException.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/TypeOf.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryMinus.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryPlus.kt (100%)
 rename compiler/ir/backend.jvm/{ => codegen}/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnsafeCoerce.kt (100%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5f0f8c4e5bf..a37793b1703 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -242,6 +242,7 @@ val fe10CompilerModules = arrayOf(
     ":compiler:ir.psi2ir",
     ":compiler:backend.jvm",
     ":compiler:backend.jvm.lower",
+    ":compiler:backend.jvm.codegen",
     ":compiler:backend.jvm.entrypoint",
     ":compiler:backend.js",
     ":compiler:backend.wasm",
diff --git a/compiler/ir/backend.jvm/build.gradle.kts b/compiler/ir/backend.jvm/build.gradle.kts
index e2337406268..402ea28bae6 100644
--- a/compiler/ir/backend.jvm/build.gradle.kts
+++ b/compiler/ir/backend.jvm/build.gradle.kts
@@ -4,13 +4,12 @@ plugins {
 }
 
 dependencies {
-    api(project(":kotlin-annotations-jvm"))
     api(project(":compiler:backend"))
     api(project(":compiler:ir.tree"))
     api(project(":compiler:ir.backend.common"))
     api(project(":compiler:backend.common.jvm"))
     compileOnly(project(":compiler:ir.tree.impl"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
 }
 
 sourceSets {
diff --git a/compiler/ir/backend.jvm/codegen/build.gradle.kts b/compiler/ir/backend.jvm/codegen/build.gradle.kts
new file mode 100644
index 00000000000..e352f1f7e84
--- /dev/null
+++ b/compiler/ir/backend.jvm/codegen/build.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    api(project(":compiler:ir.tree"))
+    api(project(":compiler:ir.backend.common"))
+    api(project(":compiler:backend.jvm"))
+    implementation(project(":compiler:ir.tree.impl"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+}
+
+sourceSets {
+    "main" {
+        projectDefault()
+    }
+    "test" {}
+}
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrCallGenerator.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrCallGenerator.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrCallGenerator.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrCallGenerator.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCallGenerator.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCallGenerator.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCallGenerator.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCallGenerator.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCodegen.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCodegen.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCodegen.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineDefaultCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineDefaultCodegen.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineDefaultCodegen.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineDefaultCodegen.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineIntrinsicsSupport.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineIntrinsicsSupport.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineIntrinsicsSupport.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineIntrinsicsSupport.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/SwitchGenerator.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/AndAnd.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/AndAnd.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/AndAnd.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/AndAnd.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayGet.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayGet.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayGet.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayGet.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayIterator.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayIterator.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayIterator.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArrayIterator.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySet.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySet.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySet.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySet.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySize.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySize.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySize.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ArraySize.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/BinaryOp.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/BinaryOp.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/BinaryOp.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/BinaryOp.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Clone.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Clone.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Clone.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Clone.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/EnumIntrinsics.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/EnumIntrinsics.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/EnumIntrinsics.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/EnumIntrinsics.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaObjectType.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaObjectType.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaObjectType.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaObjectType.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaPrimitiveType.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaPrimitiveType.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaPrimitiveType.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaPrimitiveType.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/HashCode.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/HashCode.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/HashCode.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/HashCode.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Increment.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Increment.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Increment.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Increment.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicMethod.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicMethod.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicMethod.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicMethod.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicShouldHaveBeenLowered.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicShouldHaveBeenLowered.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicShouldHaveBeenLowered.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IntrinsicShouldHaveBeenLowered.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Inv.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Inv.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Inv.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Inv.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrCheckNotNull.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrCheckNotNull.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrCheckNotNull.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrCheckNotNull.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberHashCode.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberHashCode.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberHashCode.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberHashCode.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberToString.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberToString.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberToString.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrDataClassArrayMemberToString.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIllegalArgumentException.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIllegalArgumentException.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIllegalArgumentException.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIllegalArgumentException.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicFunction.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicFunction.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicFunction.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicFunction.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrNoWhenBranchMatchedException.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrNoWhenBranchMatchedException.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrNoWhenBranchMatchedException.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrNoWhenBranchMatchedException.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IsArrayOf.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IsArrayOf.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IsArrayOf.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IsArrayOf.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JavaClassProperty.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JavaClassProperty.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JavaClassProperty.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JavaClassProperty.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmDebuggerInvokeSpecial.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmDebuggerInvokeSpecial.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmDebuggerInvokeSpecial.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmDebuggerInvokeSpecial.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmInvokeDynamic.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmInvokeDynamic.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmInvokeDynamic.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmInvokeDynamic.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/KClassJavaProperty.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/KClassJavaProperty.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/KClassJavaProperty.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/KClassJavaProperty.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/MonitorInstruction.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/MonitorInstruction.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/MonitorInstruction.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/MonitorInstruction.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NewArray.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NewArray.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NewArray.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NewArray.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Not.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Not.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Not.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Not.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NumberCast.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NumberCast.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NumberCast.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/NumberCast.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/OrOr.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/OrOr.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/OrOr.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/OrOr.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/PostfixIinc.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/PostfixIinc.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/PostfixIinc.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/PostfixIinc.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/RangeTo.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/RangeTo.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/RangeTo.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/RangeTo.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/SignatureString.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/SignatureString.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/SignatureString.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/SignatureString.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringGetChar.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringGetChar.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringGetChar.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringGetChar.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowIntrinsics.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowKotlinNothingValueException.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowKotlinNothingValueException.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowKotlinNothingValueException.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/ThrowKotlinNothingValueException.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/TypeOf.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/TypeOf.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/TypeOf.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/TypeOf.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryMinus.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryMinus.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryMinus.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryMinus.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryPlus.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryPlus.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryPlus.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnaryPlus.kt
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnsafeCoerce.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnsafeCoerce.kt
similarity index 100%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnsafeCoerce.kt
rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/intrinsics/UnsafeCoerce.kt
diff --git a/compiler/ir/backend.jvm/entrypoint/build.gradle.kts b/compiler/ir/backend.jvm/entrypoint/build.gradle.kts
index 867363d4895..b86bc7d51f3 100644
--- a/compiler/ir/backend.jvm/entrypoint/build.gradle.kts
+++ b/compiler/ir/backend.jvm/entrypoint/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     api(project(":compiler:ir.tree.impl"))
     api(project(":compiler:ir.serialization.jvm"))
     implementation(project(":compiler:backend.jvm.lower"))
+    implementation(project(":compiler:backend.jvm.codegen"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
 }
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrJvmFlexibleType.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrJvmFlexibleType.kt
index f20f6f4f1e2..1847f876654 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrJvmFlexibleType.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrJvmFlexibleType.kt
@@ -67,7 +67,7 @@ private class IrJvmFlexibleTypeImpl(
         }
 }
 
-internal fun IrType.isWithFlexibleNullability(): Boolean =
+fun IrType.isWithFlexibleNullability(): Boolean =
     hasAnnotation(JvmSymbols.FLEXIBLE_NULLABILITY_ANNOTATION_FQ_NAME)
 
 internal fun IrType.isWithFlexibleMutability(): Boolean =
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/mapping/MethodSignatureMapper.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/mapping/MethodSignatureMapper.kt
index 1f3422aa355..89a02d59d17 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/mapping/MethodSignatureMapper.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/mapping/MethodSignatureMapper.kt
@@ -385,7 +385,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
         }
 
     // TODO get rid of 'caller' argument
-    internal fun mapToCallableMethod(expression: IrCall, caller: IrFunction?): IrCallableMethod {
+    fun mapToCallableMethod(expression: IrCall, caller: IrFunction?): IrCallableMethod {
         val callee = expression.symbol.owner
         val calleeParent = expression.superQualifierSymbol?.owner
             ?: expression.dispatchReceiver?.type?.classOrNull?.owner?.let {
diff --git a/settings.gradle b/settings.gradle
index 77f96006c7f..419596b9a63 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -140,6 +140,7 @@ include ":benchmarks",
         ":compiler:backend.wasm",
         ":compiler:backend.jvm",
         ":compiler:backend.jvm.lower",
+        ":compiler:backend.jvm.codegen",
         ":compiler:backend.jvm.entrypoint",
         ":compiler:backend-common",
         ":compiler:backend",
@@ -588,6 +589,7 @@ project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" a
 project(':compiler:backend.wasm').projectDir = "$rootDir/compiler/ir/backend.wasm" as File
 project(':compiler:backend.jvm').projectDir = "$rootDir/compiler/ir/backend.jvm" as File
 project(':compiler:backend.jvm.lower').projectDir = "$rootDir/compiler/ir/backend.jvm/lower" as File
+project(':compiler:backend.jvm.codegen').projectDir = "$rootDir/compiler/ir/backend.jvm/codegen" as File
 project(':compiler:backend.jvm.entrypoint').projectDir = "$rootDir/compiler/ir/backend.jvm/entrypoint" as File
 project(':compiler:ir.serialization.common').projectDir = "$rootDir/compiler/ir/serialization.common" as File
 project(':compiler:ir.serialization.jvm').projectDir = "$rootDir/compiler/ir/serialization.jvm" as File