Fix this remapping in inner class constructors

Inner class constructors should use the argument instead of reading
outer `this` from a field because if such an access happens before a
delegating constructor call, e.g. when evaluating an argument, a JVM
bytecode validation error will be thrown. (The only operation on `this`
allowed before a delegating constructor call is SETFIELD, and only if
the field in question is declared in the same class.)

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InnerClassesLowering.kt

@@ -77,10 +77,20 @@ class InnerClassesLowering(val context: BackendContext) : ClassLoweringPass {
         irClass.transformChildrenVoid(VariableRemapper(oldConstructorParameterToNew))
 
         irClass.transformChildrenVoid(object : IrElementTransformerVoid() {
+            private var enclosingConstructor: IrConstructor? = null
+
             // TODO: maybe add another transformer that skips specified elements
             override fun visitClass(declaration: IrClass): IrStatement =
                 declaration
 
+            override fun visitConstructor(declaration: IrConstructor): IrStatement =
+                try {
+                    enclosingConstructor = declaration
+                    super.visitConstructor(declaration)
+                } finally {
+                    enclosingConstructor = null
+                }
+
             override fun visitGetValue(expression: IrGetValue): IrExpression {
                 expression.transformChildrenVoid(this)
 
@@ -100,8 +110,14 @@ class InnerClassesLowering(val context: BackendContext) : ClassLoweringPass {
                         return expression
                     }
 
-                    val outerThisField = context.declarationFactory.getOuterThisField(innerClass)
+                    irThis = if (enclosingConstructor != null && irClass == innerClass) {
-                    irThis = IrGetFieldImpl(startOffset, endOffset, outerThisField.symbol, outerThisField.type, irThis, origin)
+                        // Might be before a super() call (e.g. an argument to one), in which case the JVM bytecode verifier will reject
+                        // an attempt to access the field. Good thing we have a local variable as well.
+                        IrGetValueImpl(startOffset, endOffset, enclosingConstructor!!.valueParameters[0].symbol, origin)
+                    } else {
+                        val outerThisField = context.declarationFactory.getOuterThisField(innerClass)
+                        IrGetFieldImpl(startOffset, endOffset, outerThisField.symbol, outerThisField.type, irThis, origin)
+                    }
                     innerClass = innerClass.parentAsClass
                 }
                 return irThis

compiler/testData/codegen/box/classes/inheritedInnerClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 class Outer() {
   open inner class InnerBase() {
   }

compiler/testData/codegen/box/classes/inner/kt6708.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class A() {
     open inner class InnerA
 }
@@ -10,4 +9,4 @@ class B : A() {
 fun box(): String {
     B().InnerB()
     return "OK"
-}
+}

compiler/testData/codegen/box/classes/propertyInInitializer.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 class Outer() {
   val s = "xyzzy"
 

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/constructorParameterAndLocalCapturedInLambdaInLocalClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Base(val fn: () -> String)
 
 fun box(): String {
@@ -9,4 +8,4 @@ fun box(): String {
     }
 
     return Local().Inner("K").fn()
-}
+}

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/constructorParameterCapturedInLambdaInLocalClass2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Base(val fn: () -> String)
 
 fun box(): String {
@@ -7,4 +6,4 @@ fun box(): String {
     }
 
     return Local("OK").Inner().fn()
-}
+}

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt13454.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Foo(val x: () -> String)
 
 class Outer {
@@ -7,4 +6,4 @@ class Outer {
     inner class Inner : Foo({ s })
 }
 
-fun box() = Outer().Inner().x()
+fun box() = Outer().Inner().x()

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt14148.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 interface Test {
     fun test(): String
 }
@@ -15,4 +14,4 @@ open class Outer(val x: String) {
     )
 }
 
-fun box() = Outer("OK").JavacBug().test.test()
+fun box() = Outer("OK").JavacBug().test.test()

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/localCapturedInLambdaInInnerClassInLocalClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Base(val fn: () -> String)
 
 fun box(): String {
@@ -9,4 +8,4 @@ fun box(): String {
     }
 
     return Local().Inner().fn()
-}
+}

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInFunctionLiteral.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Base(val callback: () -> String)
 
 class Outer {
@@ -12,4 +11,4 @@ class Outer {
 }
 
 fun box(): String =
-        Outer().Inner().callback()
+        Outer().Inner().callback()

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Base(val callback: () -> String)
 
 class Outer {

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambda2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Base(val callback: () -> String)
 
 class Outer {
@@ -11,4 +10,4 @@ class Outer {
 }
 
 fun box(): String =
-        Outer().Inner1().Inner2().callback()
+        Outer().Inner1().Inner2().callback()

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSecondaryConstructor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Base(val callback: () -> String)
 
 class Outer {
@@ -10,4 +9,4 @@ class Outer {
 }
 
 fun box(): String =
-        Outer().Inner().callback()
+        Outer().Inner().callback()

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLambdaInSubExpression.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Foo(val x: () -> String)
 open class Foo2(val foo: Foo)
 

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInNestedLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Base(val callback: () -> String)
 
 class Outer {
@@ -8,4 +7,4 @@ class Outer {
 }
 
 fun box(): String =
-        Outer().Inner().callback()
+        Outer().Inner().callback()

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInNestedObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 interface Callback {
     fun invoke(): String
 }
@@ -19,4 +18,4 @@ class Outer {
 }
 
 fun box(): String =
-        Outer().Inner().callback.invoke()
+        Outer().Inner().callback.invoke()

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 interface Callback {
     fun invoke(): String
 }
@@ -16,4 +15,4 @@ class Outer {
 }
 
 fun box(): String =
-        Outer().Inner().callback.invoke()
+        Outer().Inner().callback.invoke()

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInObject2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 interface Callback {
     fun invoke(): String
 }
@@ -18,4 +17,4 @@ class Outer {
 }
 
 fun box(): String =
-        Outer().Inner1().Inner2().callback.invoke()
+        Outer().Inner1().Inner2().callback.invoke()

compiler/testData/codegen/box/innerNested/innerJavaClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: JavaClass.java
 

compiler/testData/codegen/box/innerNested/passingOuterRef.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class A1(y: String) {
     val x = "A1.x,$y"
 }
@@ -45,4 +44,4 @@ fun box(): String {
     if (r2 != "A1.x,B1.param,q;A3.x,B2.param,w;A1.x,B1.param,B3.param,e;A3.x,d") return "fail2: $r2"
 
     return "OK"
-}
+}

compiler/testData/codegen/box/innerNested/superConstructorCall/deepInnerHierarchy.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class A(val s: String) {
     open inner class B(s: String): A(s)
 

compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Father(val param: String) {
     abstract inner class InClass {
         fun work(): String {
@@ -15,4 +14,4 @@ open class Father(val param: String) {
 
 fun box(): String {
     return Father("fail").Child("OK").Child2().work()
-}
+}

compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Father(val param: String) {
     abstract inner class InClass {
         fun work(): String {
@@ -15,4 +14,4 @@ open class Father(val param: String) {
 
 fun box(): String {
     return Father("fail").Child("OK").Child2().work()
-}
+}

compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 fun String.bar(): String {
     open class Local {
         fun result() = this@bar

compiler/testData/codegen/box/secondaryConstructors/innerClasses.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 class Outer {
     val outerProp: String
     constructor(x: String) {

compiler/testData/codegen/box/secondaryConstructors/innerClassesInheritance.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 class Outer {
     val outerProp: String
     constructor(x: String) {

compiler/testData/codegen/box/typealias/innerClassTypeAliasConstructorInSupertypes.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 class Outer(val x: String) {
     abstract inner class InnerBase
 
@@ -10,4 +9,4 @@ class Outer(val x: String) {
 typealias OIB = Outer.InnerBase
 
 fun box(): String =
-        Outer("O").Inner("K").z
+        Outer("O").Inner("K").z