Maintain evaluation order for suspend calls in constructor arguments

Insert 'Class.forName(...)' in place of NEW instruction, so that the
corresponding class will be initialized if required.

compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/processUninitializedStores.kt

@@ -70,10 +70,16 @@ import org.jetbrains.org.objectweb.asm.tree.analysis.Interpreter
  *   - restore constructor arguments
  */
 internal fun processUninitializedStores(methodNode: MethodNode) {
-    UninitializedStoresProcessor(methodNode, forCoroutines = true).run()
+    UninitializedStoresProcessor(methodNode).run()
 }
 
-class UninitializedStoresProcessor(private val methodNode: MethodNode, private val forCoroutines: Boolean) {
+class UninitializedStoresProcessor(private val methodNode: MethodNode) {
+    // <init> method is "special", because it will invoke <init> from this class or from a base class for #0
+    //
+    // <clinit> method is "special", because <clinit> for singleton objects is generated as:
+    //      NEW <obj>
+    //      INVOKESPECIAL <obj>.<init> ()V
+    // and the newly created value is dropped.
     private val isInSpecialMethod = methodNode.name == "<init>" || methodNode.name == "<clinit>"
 
     fun run() {
@@ -97,26 +103,22 @@ class UninitializedStoresProcessor(private val methodNode: MethodNode, private v
 
             methodNode.instructions.run {
                 removeAll(copyUsages)
-                if (forCoroutines) {
-                    remove(newInsn)
-                }
-                else {
-                    // Replace 'NEW C' instruction with "manual" initialization of class 'C':
-                    //      LDC [typeName for C]
-                    //      INVOKESTATIC java/lang/Class.forName (Ljava/lang/String;)Ljava/lang/Class;
-                    //      POP
-                    val typeNameForClass = newInsn.desc.replace('/', '.')
-                    insertBefore(newInsn, LdcInsnNode(typeNameForClass))
-                    insertBefore(
-                            newInsn,
-                            MethodInsnNode(
-                                    Opcodes.INVOKESTATIC,
-                                    "java/lang/Class", "forName", "(Ljava/lang/String;)Ljava/lang/Class;",
-                                    false
-                            )
-                    )
-                    set(newInsn, InsnNode(Opcodes.POP))
-                }
+
+                // Replace 'NEW C' instruction with "manual" initialization of class 'C':
+                //      LDC [typeName for C]
+                //      INVOKESTATIC java/lang/Class.forName (Ljava/lang/String;)Ljava/lang/Class;
+                //      POP
+                val typeNameForClass = newInsn.desc.replace('/', '.')
+                insertBefore(newInsn, LdcInsnNode(typeNameForClass))
+                insertBefore(
+                        newInsn,
+                        MethodInsnNode(
+                                Opcodes.INVOKESTATIC,
+                                "java/lang/Class", "forName", "(Ljava/lang/String;)Ljava/lang/Class;",
+                                false
+                        )
+                )
+                set(newInsn, InsnNode(Opcodes.POP))
             }
 
             val indexOfConstructorArgumentFromTopOfStack = Type.getArgumentTypes((insn as MethodInsnNode).desc).size

compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/UninitializedStoresMethodTransformer.kt

@@ -22,6 +22,6 @@ import org.jetbrains.org.objectweb.asm.tree.MethodNode
 
 class UninitializedStoresMethodTransformer : MethodTransformer() {
     override fun transform(internalClassName: String, methodNode: MethodNode) {
-        UninitializedStoresProcessor(methodNode, forCoroutines = false).run()
+        UninitializedStoresProcessor(methodNode).run()
     }
 }

compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt

@@ -0,0 +1,56 @@
+// WITH_RUNTIME
+// WITH_COROUTINES
+import helpers.*
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
+
+class Controller {
+    suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
+        x.resume("K")
+        COROUTINE_SUSPENDED
+    }
+}
+
+fun builder(c: suspend Controller.() -> Unit) {
+    c.startCoroutine(Controller(), EmptyContinuation)
+}
+
+val logger = StringBuilder()
+
+class A(val first: String, val second: String) {
+    init {
+        logger.append("A.<init>;")
+    }
+
+    override fun toString() = "$first$second"
+
+    companion object {
+        init {
+            logger.append("A.<clinit>;")
+        }
+    }
+}
+
+inline fun <T> logged(message: String, result: () -> T): T {
+    logger.append(message)
+    return result()
+}
+
+fun box(): String {
+    var result = "OK"
+
+    builder {
+        var local: Any = A(logged("args;") { "O" }, suspendHere())
+
+        if (local.toString() != "OK") {
+            result = "fail 1: $local"
+            return@builder
+        }
+    }
+
+    if (logger.toString() != "A.<clinit>;args;A.<init>;") {
+        return "Fail: '$logger'"
+    }
+
+    return result
+}

compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java

@@ -5498,6 +5498,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             doTest(fileName);
         }
 
+        @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt")
+        public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("suspensionInsideSafeCall.kt")
         public void testSuspensionInsideSafeCall() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt");

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java

@@ -5498,6 +5498,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt")
+        public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("suspensionInsideSafeCall.kt")
         public void testSuspensionInsideSafeCall() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt");

compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -5498,6 +5498,12 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             doTest(fileName);
         }
 
+        @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt")
+        public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("suspensionInsideSafeCall.kt")
         public void testSuspensionInsideSafeCall() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java

@@ -6146,6 +6146,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             doTest(fileName);
         }
 
+        @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt")
+        public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("suspensionInsideSafeCall.kt")
         public void testSuspensionInsideSafeCall() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt");