Keep inline transformation invariant: all captured parameters stored in topmost lambda/object

Fix for KT-8668: java.lang.ClassFormatError: Duplicate field name&signature (based on property access)

  #KT-8668 Fixed

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/inlineChain.1.kt

@@ -0,0 +1,7 @@
+import test.*
+
+fun box(): String {
+    var result = "fail"
+    B("O", "K").test { it -> result = it }
+    return result
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/inlineChain.2.kt

@@ -0,0 +1,22 @@
+package test
+
+interface A {
+    fun run()
+}
+
+class B(val o: String, val k: String) {
+
+    inline fun testNested(crossinline f: (String) -> Unit) {
+        object : A {
+            override fun run() {
+                f(o)
+            }
+        }.run()
+    }
+
+    inline fun test(crossinline f: (String) -> Unit) {
+        testNested { it -> { f(it + k) }() }
+    }
+
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/inlinelambdaChain.1.kt

@@ -0,0 +1,6 @@
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+fun box(): String {
+    return A().box()
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/inlinelambdaChain.2.kt

@@ -0,0 +1,30 @@
+package test
+
+class A {
+    val param = "start"
+    var result = "fail"
+    var addParam = "_additional_"
+
+    inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
+        {
+            f(arg + addParam)
+        }()
+    }
+
+    fun box(): String {
+        {
+            inlineFun("1") { c ->
+                inlineFun("2") { a ->
+                    {
+                        {
+                            result = param + c + a
+                        }()
+                    }()
+                }
+
+            }
+        }()
+
+        return if (result == "start1_additional_2_additional_") "OK" else "fail: $result"
+    }
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain.1.kt

@@ -0,0 +1,6 @@
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+fun box(): String {
+    return A().box()
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain.2.kt

@@ -0,0 +1,28 @@
+package test
+
+class A {
+    val param = "start"
+    var result = "fail"
+    var addParam = "_additional_"
+
+    inline fun inlineFun(arg: String, f: (String) -> Unit) {
+        f(arg + addParam)
+    }
+
+    fun box(): String {
+        inlineFun("1") { c ->
+            {
+                inlineFun("2") { a ->
+                    {
+                        {
+                            result = param + c + a
+                        }()
+                    }()
+                }
+            }()
+        }
+
+        return if (result == "start1_additional_2_additional_") "OK" else "fail: $result"
+    }
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChainSimple.1.kt

@@ -0,0 +1,6 @@
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+fun box(): String {
+    return A().box()
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChainSimple.2.kt

@@ -0,0 +1,24 @@
+package test
+
+class A {
+    val param = "start"
+    var result = "fail"
+    var addParam = "_additional_"
+
+    inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
+        {
+            f(arg + addParam)
+        }()
+    }
+
+
+    fun box(): String {
+        inlineFun("2") { a ->
+            {
+                result = param + a
+            }()
+        }
+        return if (result == "start2_additional_") "OK" else "fail: $result"
+    }
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChainSimple_2.1.kt

@@ -0,0 +1,6 @@
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+fun box(): String {
+    return A().box()
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChainSimple_2.2.kt

@@ -0,0 +1,26 @@
+package test
+
+class A {
+    val param = "start"
+    var result = "fail"
+    var addParam = "_additional_"
+
+    inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
+        {
+            f(arg + addParam)
+        }()
+    }
+
+
+    fun box(): String {
+        {
+            inlineFun("2") { a ->
+                {
+                    result = param + a
+                }()
+            }
+        }()
+        return if (result == "start2_additional_") "OK" else "fail: $result"
+    }
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain_2.1.kt

@@ -0,0 +1,6 @@
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+fun box(): String {
+    return A().box()
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain_2.2.kt

@@ -0,0 +1,29 @@
+package test
+
+class A {
+    val param = "start"
+    var result = "fail"
+    var addParam = "_additional_"
+
+    inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
+        {
+            f(arg + addParam)
+        }()
+    }
+
+    fun box(): String {
+        inlineFun("1")  { c ->
+            {
+                inlineFun("2") { a ->
+                    {
+                        {
+                            result = param + c + a
+                        }()
+                    }()
+                }
+            }()
+        }
+
+        return if (result == "start1_additional_2_additional_") "OK" else "fail: $result"
+    }
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain_3.1.kt

@@ -0,0 +1,6 @@
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+fun box(): String {
+    return A().box()
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain_3.2.kt

@@ -0,0 +1,29 @@
+package test
+
+class A {
+    val param = "start"
+    var result = "fail"
+    var addParam = "_additional_"
+
+    inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
+        {
+            f(arg + addParam)
+        }()
+    }
+
+    fun box(): String {
+        inlineFun("1") { c ->
+            {
+                inlineFun("2") { a ->
+                    {
+                        result = param + c + a
+                    }()
+                }
+            }()
+        }
+
+        return if (result == "start1_additional_2_additional_") "OK" else "fail: $result"
+    }
+
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/noCapturedThisOnCallSite.1.kt

@@ -0,0 +1,7 @@
+import test.*
+
+fun box(): String {
+    var result = "fail"
+    B("O", "fail").test { it -> result = it }
+    return result
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/noCapturedThisOnCallSite.2.kt

@@ -0,0 +1,21 @@
+package test
+
+interface A {
+    fun run()
+}
+
+class B(val o: String, val k: String) {
+
+    inline fun testNested(crossinline f: (String) -> Unit) {
+        object : A {
+            override fun run() {
+                f(o)
+            }
+        }.run()
+    }
+
+    inline fun test(crossinline f: (String) -> Unit) {
+        testNested { it -> { f(it + "K") }() }
+    }
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/noInlineLambda.1.kt

@@ -0,0 +1,8 @@
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+fun box(): String {
+    var result = "fail"
+    B("O", "K").test { it -> result = it }
+    return result
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/noInlineLambda.2.kt

@@ -0,0 +1,22 @@
+package test
+
+interface  A {
+    fun run()
+}
+
+class B(val o: String, val k: String) {
+
+    inline fun testNested(crossinline f: (String) -> Unit) {
+        object : A {
+            override fun run() {
+                f(o)
+            }
+        }.run()
+    }
+
+    fun test(f: (String) -> Unit) {
+        testNested { it -> { f(it + k) }() }
+    }
+
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/twoInlineLambda.1.kt

@@ -0,0 +1,7 @@
+import test.*
+
+fun box(): String {
+    var result = ""
+    B("O", "K").test { it -> result += it }
+    return if (result == "OOKK") "OK" else "fail: $result"
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/twoInlineLambda.2.kt

@@ -0,0 +1,22 @@
+package test
+
+interface A {
+    fun run()
+}
+
+class B(val o: String, val k: String) {
+
+    inline fun testNested(crossinline f2: (String) -> Unit, crossinline f3: (String) -> Unit) {
+        object : A {
+            override fun run() {
+                f2(o)
+                f3(k)
+            }
+        }.run()
+    }
+
+    inline fun test(crossinline f: (String) -> Unit) {
+        testNested ({ it ->  f(it + o) }) { it -> f(it + k) }
+    }
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/twoInlineLambdaComplex.1.kt

@@ -0,0 +1,7 @@
+import test.*
+
+fun box(): String {
+    var result = ""
+    B("O", "K").test { it -> result += it }
+    return if (result == "OOKK") "OK" else "fail: $result"
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/twoInlineLambdaComplex.2.kt

@@ -0,0 +1,31 @@
+package test
+
+interface A {
+    fun run()
+}
+
+class B(val o: String, val k: String) {
+
+    inline fun testNested(crossinline f: (String) -> Unit, crossinline f2: (String) -> Unit) {
+        object : A {
+            override fun run() {
+                f(o)
+                f2(k)
+            }
+        }.run()
+    }
+
+    inline fun test(crossinline f: (String) -> Unit) {
+        call {
+            {
+                testNested ({ it -> { f(it + o) }() }) { it -> { f(it + k) }() }
+            }()
+        }
+    }
+
+    inline fun call(f: () -> Unit) {
+        f()
+    }
+
+
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/twoInlineLambdaComplex_2.1.kt

@@ -0,0 +1,7 @@
+import test.*
+
+fun box(): String {
+    var result = ""
+    B("O", "K").test { it -> result += it }
+    return if (result == "startOOKK") "OK" else "fail: $result"
+}

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/twoInlineLambdaComplex_2.2.kt

@@ -0,0 +1,32 @@
+package test
+
+interface A {
+    fun run()
+}
+
+class B(val o: String, val k: String) {
+
+    inline fun testNested(crossinline f: (String) -> Unit, crossinline f2: (String) -> Unit) {
+        object : A {
+            override fun run() {
+                f(o)
+                f2(k)
+            }
+        }.run()
+    }
+
+    inline fun test(crossinline f: (String) -> Unit) {
+        call {
+            f("start");
+            {
+                testNested ({ it -> { f(it + o) }() }) { it -> { f(it + k) }() }
+            }()
+        }
+    }
+
+    inline fun call(f: () -> Unit) {
+        f()
+    }
+
+
+}