Support crossinline suspend lambda as parameter of inline function

Use fake continuation instead of ALOAD 0 while inlining Do not generate state machine for inner lambdas and inner objects, which capture crossinline suspend lambda. #KT-19159: Fixed
2018-01-18 15:21:19 +03:00
parent 042ca55be7
commit 6854135077
80 changed files with 5214 additions and 144 deletions
@@ -0,0 +1,100 @@
+// FILE: test.kt
+// WITH_RUNTIME
+// NO_CHECK_LAMBDA_INLINING
+
+import kotlin.coroutines.experimental.*
+
+class Controller {
+    var res = "FAIL 1"
+}
+
+val defaultController = Controller()
+
+suspend inline fun test1(controller: Controller = defaultController, crossinline c: suspend Controller.() -> Unit) {
+    controller.c()
+}
+
+suspend inline fun test2(controller: Controller = defaultController, crossinline c: suspend Controller.() -> Unit) {
+    val l : suspend () -> Unit = {
+        controller.c()
+    }
+    l()
+}
+
+interface SuspendRunnable {
+    suspend fun run()
+}
+
+suspend inline fun test3(controller: Controller = defaultController, crossinline c: suspend Controller.() -> Unit) {
+    val sr = object: SuspendRunnable {
+        override suspend fun run() {
+            controller.c()
+        }
+    }
+    sr.run()
+}
+
+// FILE: box.kt
+
+import kotlin.coroutines.experimental.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(object: Continuation<Unit> {
+        override val context: CoroutineContext
+            get() = EmptyCoroutineContext
+
+        override fun resume(value: Unit) {
+        }
+
+        override fun resumeWithException(exception: Throwable) {
+            throw exception
+        }
+    })
+}
+
+suspend fun calculate() = "OK"
+
+fun box() : String {
+    builder {
+        test1 {
+            res = calculate()
+        }
+    }
+    if (defaultController.res != "OK") return defaultController.res
+    defaultController.res = "FAIL 2"
+    builder {
+        test2 {
+            res = calculate()
+        }
+    }
+    if (defaultController.res != "OK") return defaultController.res
+    defaultController.res = "FAIL 3"
+    builder {
+        test3 {
+            res = calculate()
+        }
+    }
+    if (defaultController.res != "OK") return defaultController.res
+    val controller = Controller()
+    controller.res = "FAIL 4"
+    builder {
+        test1(controller) {
+            res = calculate()
+        }
+    }
+    if (controller.res != "OK") return controller.res
+    controller.res = "FAIL 5"
+    builder {
+        test2(controller) {
+            res = calculate()
+        }
+    }
+    if (controller.res != "OK") return controller.res
+    controller.res = "FAIL 6"
+    builder {
+        test3(controller) {
+            res = calculate()
+        }
+    }
+    return controller.res
+}