JVM: Take inline class mangling state into account for default methods

compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt

@@ -375,13 +375,27 @@ class KotlinTypeMapper @JvmOverloads constructor(
         kind: OwnerKind? = null,
         resolvedCall: ResolvedCall<*>? = null
     ): CallableMethod {
+        fun mapDefaultCallback(descriptor: FunctionDescriptor, kind: OwnerKind): () -> Method {
+            if (useOldManglingRulesForFunctionAcceptingInlineClass && !useOldInlineClassesManglingScheme) {
+                return {
+                    val prevManglingState = useOldManglingRulesForFunctionAcceptingInlineClass
+                    useOldManglingRulesForFunctionAcceptingInlineClass = true
+                    mapDefaultMethod(descriptor, kind).also {
+                        useOldManglingRulesForFunctionAcceptingInlineClass = prevManglingState
+                    }
+                }
+            } else {
+                return { mapDefaultMethod(descriptor, kind) }
+            }
+        }
+
         // we generate constructors of inline classes as usual functions
         if (descriptor is ConstructorDescriptor && kind != OwnerKind.ERASED_INLINE_CLASS) {
             val method = mapSignatureSkipGeneric(descriptor.original)
             val owner = mapOwner(descriptor)
             val originalDescriptor = descriptor.original
             return CallableMethod(
-                owner, owner, { mapDefaultMethod(originalDescriptor, OwnerKind.IMPLEMENTATION) }, method, INVOKESPECIAL,
+                owner, owner, mapDefaultCallback(originalDescriptor, OwnerKind.IMPLEMENTATION), method, INVOKESPECIAL,
                 null, null, null, null, null, originalDescriptor.returnType, isInterfaceMethod = false, isDefaultMethodInInterface = false,
                 boxInlineClassBeforeInvoke = false
             )
@@ -557,7 +571,7 @@ class KotlinTypeMapper @JvmOverloads constructor(
 
         return CallableMethod(
             owner, ownerForDefaultImpl,
-            { mapDefaultMethod(baseMethodDescriptor, getKindForDefaultImplCall(baseMethodDescriptor)) },
+            mapDefaultCallback(baseMethodDescriptor, getKindForDefaultImplCall(baseMethodDescriptor)),
             signature, invokeOpcode, thisClass, dispatchReceiverKotlinType, receiverParameterType, extensionReceiverKotlinType,
             calleeType, returnKotlinType,
             if (jvmTarget >= JvmTarget.JVM_1_8) isInterfaceMember else invokeOpcode == INVOKEINTERFACE,

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java

@@ -50,6 +50,11 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi
         runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassType.kt");
     }
 
+    @TestMetadata("callDeserializedPropertyOnInlineClassTypeOldMangling.kt")
+    public void testCallDeserializedPropertyOnInlineClassTypeOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassTypeOldMangling.kt");
+    }
+
     @TestMetadata("callsToMultifileClassFromOtherPackage.kt")
     public void testCallsToMultifileClassFromOtherPackage() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt");
@@ -90,6 +95,11 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi
         runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependencies.kt");
     }
 
+    @TestMetadata("constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt")
+    public void testConstructorWithInlineClassParametersInBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("copySamOnInline.kt")
     public void testCopySamOnInline() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/copySamOnInline.kt");
@@ -125,6 +135,11 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi
         runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceivers.kt");
     }
 
+    @TestMetadata("defaultWithInlineClassAndReceiversOldMangling.kt")
+    public void testDefaultWithInlineClassAndReceiversOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceiversOldMangling.kt");
+    }
+
     @TestMetadata("delegatedDefault.kt")
     public void testDelegatedDefault() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/delegatedDefault.kt");
@@ -165,21 +180,41 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideMangling.kt");
     }
 
+    @TestMetadata("inlineClassFakeOverrideManglingOldMangling.kt")
+    public void testInlineClassFakeOverrideManglingOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideManglingOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassFromBinaryDependencies.kt")
     public void testInlineClassFromBinaryDependencies() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt");
     }
 
+    @TestMetadata("inlineClassFromBinaryDependenciesOldMangling.kt")
+    public void testInlineClassFromBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineFunctionCall.kt")
     public void testInlineClassInlineFunctionCall() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCall.kt");
     }
 
+    @TestMetadata("inlineClassInlineFunctionCallOldMangling.kt")
+    public void testInlineClassInlineFunctionCallOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCallOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineProperty.kt")
     public void testInlineClassInlineProperty() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassInlinePropertyOldMangling.kt")
+    public void testInlineClassInlinePropertyOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlinePropertyOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassesOldMangling.kt")
     public void testInlineClassesOldMangling() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
@@ -355,11 +390,21 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateCompanionObjectValInDifferentModuleOldMangling.kt")
+    public void testPrivateCompanionObjectValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("privateTopLevelValInDifferentModule.kt")
     public void testPrivateTopLevelValInDifferentModule() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateTopLevelValInDifferentModuleOldMangling.kt")
+    public void testPrivateTopLevelValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("propertyReference.kt")
     public void testPropertyReference() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/propertyReference.kt");
@@ -410,6 +455,11 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi
         runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt");
     }
 
+    @TestMetadata("suspendFunWithDefaultOldMangling.kt")
+    public void testSuspendFunWithDefaultOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt");
+    }
+
     @TestMetadata("targetedJvmName.kt")
     public void testTargetedJvmName() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt");

compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassType.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +InlineClasses
 // FILE: A.kt
 
 package a

compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassTypeOldMangling.kt

@@ -0,0 +1,21 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// FILE: A.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+
+package a
+
+@Suppress("UNSUPPORTED_FEATURE")
+inline class Foo(val x: IntArray) {
+    val size: Int get() = x.size
+}
+
+// FILE: B.kt
+
+import a.*
+
+fun box(): String {
+    val a = Foo(intArrayOf(3, 4))
+    if (a.size != 2) return "Fail"
+    return "OK"
+}

compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt

@@ -0,0 +1,14 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// FILE: A.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+package lib
+
+inline class S(val string: String)
+
+class Test(val s: S)
+
+// FILE: B.kt
+import lib.*
+
+fun box() = Test(S("OK")).s.string

compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceiversOldMangling.kt

@@ -0,0 +1,16 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// FILE: A.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+package z
+
+inline class Z(val s: String)
+
+class X {
+    fun Int.foo(z: Z, value: String = "OK") = value
+}
+
+// FILE: B.kt
+import z.*
+
+fun box(): String = with(X()) { 1.foo(Z("")) }

compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideManglingOldMangling.kt

@@ -0,0 +1,23 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// FILE: 1.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+
+inline class IC(val s: String)
+
+abstract class A {
+    fun foo(s: String) = IC(s)
+}
+
+open class C : A()
+
+class D: C()
+
+// FILE: 2.kt
+
+fun box(): String {
+    var res = C().foo("OK").s
+    if (res != "OK") return "FAIL 1 $res"
+    res = D().foo("OK").s
+    return res
+}

compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependenciesOldMangling.kt

@@ -0,0 +1,40 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// FILE: A.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+package z
+
+interface IFoo {
+    fun foo(): String
+}
+
+inline class Z(val s: String) : IFoo {
+    constructor(i: Int) : this(i.toString())
+
+    override fun foo(): String = s
+
+    fun bar() = s
+
+    inline fun <T> run(lambda: (String) -> T) = lambda(s)
+
+    companion object {
+        fun z(i: Int) = Z(i)
+    }
+}
+
+// FILE: B.kt
+import z.*
+
+fun test(z: Z) {
+    if (z.foo() != "1234") throw AssertionError()
+    if (z.bar() != "1234") throw AssertionError()
+    if (z.run { it } != "1234") throw AssertionError()
+    if (listOf(z)[0].s != "1234") throw AssertionError()
+}
+
+fun box(): String {
+    test(Z("1234"))
+    test(Z(1234))
+    test(Z.z(1234))
+    return "OK"
+}

compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCall.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +InlineClasses
 // FILE: A.kt
 
 inline class A(val x: String) {

compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCallOldMangling.kt

@@ -0,0 +1,14 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// FILE: A.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+
+inline class A(val x: String) {
+    inline fun f(other: A): A = other
+}
+
+// FILE: B.kt
+
+fun box(): String {
+    return A("Fail").f(A("OK")).x
+}

compiler/testData/compileKotlinAgainstKotlin/inlineClassInlinePropertyOldMangling.kt

@@ -0,0 +1,17 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// FILE: A.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+
+package a
+
+inline class S(val value: String) {
+    inline val k: String
+        get() = value + "K"
+}
+
+// FILE: B.kt
+
+fun box(): String {
+    return a.S("O").k
+}

compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModule.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +InlineClasses
 // IGNORE_BACKEND: JS_IR, JS, NATIVE
 // WITH_REFLECT
 

compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModuleOldMangling.kt

@@ -0,0 +1,24 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// IGNORE_BACKEND: JS_IR, JS, NATIVE
+// WITH_REFLECT
+
+// FILE: A.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+package a
+
+import kotlin.reflect.jvm.isAccessible
+
+inline class S(val s: String)
+
+class Host {
+    companion object {
+        private val ok = S("OK")
+        val ref = ::ok.apply { isAccessible = true }
+    }
+}
+
+// FILE: B.kt
+import a.*
+
+fun box() = Host.ref.call().s

compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModule.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +InlineClasses
 // IGNORE_BACKEND: JS_IR, JS, NATIVE
 // WITH_REFLECT
 

compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModuleOldMangling.kt

@@ -0,0 +1,21 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// IGNORE_BACKEND: JS_IR, JS, NATIVE
+// WITH_REFLECT
+
+// FILE: A.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+package a
+
+import kotlin.reflect.jvm.isAccessible
+
+inline class S(val s: String)
+
+private val ok = S("OK")
+
+val ref = ::ok.apply { isAccessible = true }
+
+// FILE: B.kt
+import a.*
+
+fun box() = ref.call().s

compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +InlineClasses
 // WITH_COROUTINES
 // FILE: a.kt
 

compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt

@@ -0,0 +1,32 @@
+// TARGET_BACKEND: JVM
+// !LANGUAGE: +InlineClasses
+// WITH_COROUTINES
+// FILE: a.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+
+package a
+
+var result = ""
+
+inline class P(val value: String)
+
+suspend fun foo(p: P = P("OK")) {
+    result = p.value
+}
+
+// FILE: b.kt
+
+import kotlin.coroutines.*
+import helpers.*
+import a.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(EmptyContinuation)
+}
+
+fun box(): String {
+    builder {
+        foo()
+    }
+    return result
+}

compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java

@@ -49,6 +49,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassType.kt");
     }
 
+    @TestMetadata("callDeserializedPropertyOnInlineClassTypeOldMangling.kt")
+    public void testCallDeserializedPropertyOnInlineClassTypeOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassTypeOldMangling.kt");
+    }
+
     @TestMetadata("callsToMultifileClassFromOtherPackage.kt")
     public void testCallsToMultifileClassFromOtherPackage() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt");
@@ -89,6 +94,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependencies.kt");
     }
 
+    @TestMetadata("constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt")
+    public void testConstructorWithInlineClassParametersInBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("copySamOnInline.kt")
     public void testCopySamOnInline() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/copySamOnInline.kt");
@@ -124,6 +134,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceivers.kt");
     }
 
+    @TestMetadata("defaultWithInlineClassAndReceiversOldMangling.kt")
+    public void testDefaultWithInlineClassAndReceiversOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceiversOldMangling.kt");
+    }
+
     @TestMetadata("delegatedDefault.kt")
     public void testDelegatedDefault() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/delegatedDefault.kt");
@@ -164,21 +179,41 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideMangling.kt");
     }
 
+    @TestMetadata("inlineClassFakeOverrideManglingOldMangling.kt")
+    public void testInlineClassFakeOverrideManglingOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideManglingOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassFromBinaryDependencies.kt")
     public void testInlineClassFromBinaryDependencies() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt");
     }
 
+    @TestMetadata("inlineClassFromBinaryDependenciesOldMangling.kt")
+    public void testInlineClassFromBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineFunctionCall.kt")
     public void testInlineClassInlineFunctionCall() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCall.kt");
     }
 
+    @TestMetadata("inlineClassInlineFunctionCallOldMangling.kt")
+    public void testInlineClassInlineFunctionCallOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCallOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineProperty.kt")
     public void testInlineClassInlineProperty() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassInlinePropertyOldMangling.kt")
+    public void testInlineClassInlinePropertyOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlinePropertyOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassesOldMangling.kt")
     public void testInlineClassesOldMangling() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
@@ -354,11 +389,21 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateCompanionObjectValInDifferentModuleOldMangling.kt")
+    public void testPrivateCompanionObjectValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("privateTopLevelValInDifferentModule.kt")
     public void testPrivateTopLevelValInDifferentModule() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateTopLevelValInDifferentModuleOldMangling.kt")
+    public void testPrivateTopLevelValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("propertyReference.kt")
     public void testPropertyReference() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/propertyReference.kt");
@@ -409,6 +454,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt");
     }
 
+    @TestMetadata("suspendFunWithDefaultOldMangling.kt")
+    public void testSuspendFunWithDefaultOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt");
+    }
+
     @TestMetadata("targetedJvmName.kt")
     public void testTargetedJvmName() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt");

compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java

@@ -50,6 +50,11 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile
         runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassType.kt");
     }
 
+    @TestMetadata("callDeserializedPropertyOnInlineClassTypeOldMangling.kt")
+    public void testCallDeserializedPropertyOnInlineClassTypeOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassTypeOldMangling.kt");
+    }
+
     @TestMetadata("callsToMultifileClassFromOtherPackage.kt")
     public void testCallsToMultifileClassFromOtherPackage() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt");
@@ -90,6 +95,11 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile
         runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependencies.kt");
     }
 
+    @TestMetadata("constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt")
+    public void testConstructorWithInlineClassParametersInBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("copySamOnInline.kt")
     public void testCopySamOnInline() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/copySamOnInline.kt");
@@ -125,6 +135,11 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile
         runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceivers.kt");
     }
 
+    @TestMetadata("defaultWithInlineClassAndReceiversOldMangling.kt")
+    public void testDefaultWithInlineClassAndReceiversOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceiversOldMangling.kt");
+    }
+
     @TestMetadata("delegatedDefault.kt")
     public void testDelegatedDefault() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/delegatedDefault.kt");
@@ -165,21 +180,41 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideMangling.kt");
     }
 
+    @TestMetadata("inlineClassFakeOverrideManglingOldMangling.kt")
+    public void testInlineClassFakeOverrideManglingOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideManglingOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassFromBinaryDependencies.kt")
     public void testInlineClassFromBinaryDependencies() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt");
     }
 
+    @TestMetadata("inlineClassFromBinaryDependenciesOldMangling.kt")
+    public void testInlineClassFromBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineFunctionCall.kt")
     public void testInlineClassInlineFunctionCall() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCall.kt");
     }
 
+    @TestMetadata("inlineClassInlineFunctionCallOldMangling.kt")
+    public void testInlineClassInlineFunctionCallOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCallOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineProperty.kt")
     public void testInlineClassInlineProperty() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassInlinePropertyOldMangling.kt")
+    public void testInlineClassInlinePropertyOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlinePropertyOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassesOldMangling.kt")
     public void testInlineClassesOldMangling() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
@@ -355,11 +390,21 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateCompanionObjectValInDifferentModuleOldMangling.kt")
+    public void testPrivateCompanionObjectValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("privateTopLevelValInDifferentModule.kt")
     public void testPrivateTopLevelValInDifferentModule() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateTopLevelValInDifferentModuleOldMangling.kt")
+    public void testPrivateTopLevelValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("propertyReference.kt")
     public void testPropertyReference() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/propertyReference.kt");
@@ -410,6 +455,11 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile
         runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt");
     }
 
+    @TestMetadata("suspendFunWithDefaultOldMangling.kt")
+    public void testSuspendFunWithDefaultOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt");
+    }
+
     @TestMetadata("targetedJvmName.kt")
     public void testTargetedJvmName() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt");

compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java

@@ -50,6 +50,11 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassType.kt");
     }
 
+    @TestMetadata("callDeserializedPropertyOnInlineClassTypeOldMangling.kt")
+    public void testCallDeserializedPropertyOnInlineClassTypeOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassTypeOldMangling.kt");
+    }
+
     @TestMetadata("callsToMultifileClassFromOtherPackage.kt")
     public void testCallsToMultifileClassFromOtherPackage() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt");
@@ -90,6 +95,11 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependencies.kt");
     }
 
+    @TestMetadata("constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt")
+    public void testConstructorWithInlineClassParametersInBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("copySamOnInline.kt")
     public void testCopySamOnInline() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/copySamOnInline.kt");
@@ -125,6 +135,11 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceivers.kt");
     }
 
+    @TestMetadata("defaultWithInlineClassAndReceiversOldMangling.kt")
+    public void testDefaultWithInlineClassAndReceiversOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceiversOldMangling.kt");
+    }
+
     @TestMetadata("delegatedDefault.kt")
     public void testDelegatedDefault() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/delegatedDefault.kt");
@@ -165,21 +180,41 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideMangling.kt");
     }
 
+    @TestMetadata("inlineClassFakeOverrideManglingOldMangling.kt")
+    public void testInlineClassFakeOverrideManglingOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideManglingOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassFromBinaryDependencies.kt")
     public void testInlineClassFromBinaryDependencies() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt");
     }
 
+    @TestMetadata("inlineClassFromBinaryDependenciesOldMangling.kt")
+    public void testInlineClassFromBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineFunctionCall.kt")
     public void testInlineClassInlineFunctionCall() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCall.kt");
     }
 
+    @TestMetadata("inlineClassInlineFunctionCallOldMangling.kt")
+    public void testInlineClassInlineFunctionCallOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCallOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineProperty.kt")
     public void testInlineClassInlineProperty() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassInlinePropertyOldMangling.kt")
+    public void testInlineClassInlinePropertyOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlinePropertyOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassesOldMangling.kt")
     public void testInlineClassesOldMangling() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
@@ -355,11 +390,21 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateCompanionObjectValInDifferentModuleOldMangling.kt")
+    public void testPrivateCompanionObjectValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("privateTopLevelValInDifferentModule.kt")
     public void testPrivateTopLevelValInDifferentModule() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateTopLevelValInDifferentModuleOldMangling.kt")
+    public void testPrivateTopLevelValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("propertyReference.kt")
     public void testPropertyReference() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/propertyReference.kt");
@@ -410,6 +455,11 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt");
     }
 
+    @TestMetadata("suspendFunWithDefaultOldMangling.kt")
+    public void testSuspendFunWithDefaultOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt");
+    }
+
     @TestMetadata("targetedJvmName.kt")
     public void testTargetedJvmName() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt");

compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java

@@ -50,6 +50,11 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassType.kt");
     }
 
+    @TestMetadata("callDeserializedPropertyOnInlineClassTypeOldMangling.kt")
+    public void testCallDeserializedPropertyOnInlineClassTypeOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassTypeOldMangling.kt");
+    }
+
     @TestMetadata("callsToMultifileClassFromOtherPackage.kt")
     public void testCallsToMultifileClassFromOtherPackage() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt");
@@ -90,6 +95,11 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependencies.kt");
     }
 
+    @TestMetadata("constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt")
+    public void testConstructorWithInlineClassParametersInBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("copySamOnInline.kt")
     public void testCopySamOnInline() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/copySamOnInline.kt");
@@ -125,6 +135,11 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceivers.kt");
     }
 
+    @TestMetadata("defaultWithInlineClassAndReceiversOldMangling.kt")
+    public void testDefaultWithInlineClassAndReceiversOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceiversOldMangling.kt");
+    }
+
     @TestMetadata("delegatedDefault.kt")
     public void testDelegatedDefault() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/delegatedDefault.kt");
@@ -165,21 +180,41 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideMangling.kt");
     }
 
+    @TestMetadata("inlineClassFakeOverrideManglingOldMangling.kt")
+    public void testInlineClassFakeOverrideManglingOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFakeOverrideManglingOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassFromBinaryDependencies.kt")
     public void testInlineClassFromBinaryDependencies() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt");
     }
 
+    @TestMetadata("inlineClassFromBinaryDependenciesOldMangling.kt")
+    public void testInlineClassFromBinaryDependenciesOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassFromBinaryDependenciesOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineFunctionCall.kt")
     public void testInlineClassInlineFunctionCall() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCall.kt");
     }
 
+    @TestMetadata("inlineClassInlineFunctionCallOldMangling.kt")
+    public void testInlineClassInlineFunctionCallOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineFunctionCallOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassInlineProperty.kt")
     public void testInlineClassInlineProperty() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @TestMetadata("inlineClassInlinePropertyOldMangling.kt")
+    public void testInlineClassInlinePropertyOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassInlinePropertyOldMangling.kt");
+    }
+
     @TestMetadata("inlineClassesOldMangling.kt")
     public void testInlineClassesOldMangling() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
@@ -355,11 +390,21 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateCompanionObjectValInDifferentModuleOldMangling.kt")
+    public void testPrivateCompanionObjectValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("privateTopLevelValInDifferentModule.kt")
     public void testPrivateTopLevelValInDifferentModule() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModule.kt");
     }
 
+    @TestMetadata("privateTopLevelValInDifferentModuleOldMangling.kt")
+    public void testPrivateTopLevelValInDifferentModuleOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModuleOldMangling.kt");
+    }
+
     @TestMetadata("propertyReference.kt")
     public void testPropertyReference() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/propertyReference.kt");
@@ -410,6 +455,11 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
         runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt");
     }
 
+    @TestMetadata("suspendFunWithDefaultOldMangling.kt")
+    public void testSuspendFunWithDefaultOldMangling() throws Exception {
+        runTest("compiler/testData/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt");
+    }
+
     @TestMetadata("targetedJvmName.kt")
     public void testTargetedJvmName() throws Exception {
         runTest("compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt");