Support new suspend convention in JVM backend partially

Stack-unwinding does not work yet

 #KT-14924 In Progress

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

@@ -6,7 +6,7 @@ class Controller {
         exception = t
     }
 
-    suspend fun suspendHere(x: Continuation<Any>) {}
+    suspend fun suspendHere(): Any = suspendWithCurrentContinuation { x ->}
 
     // INTERCEPT_RESUME_PLACEHOLDER
 }

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

@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 class Controller {
-    suspend fun suspendHere(x: Continuation<Any>) {}
+    suspend fun suspendHere(): Any = suspendWithCurrentContinuation { x ->}
 
     // INTERCEPT_RESUME_PLACEHOLDER
 }

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

@@ -4,7 +4,7 @@ class Controller {
         result = "OK"
     }
 
-    suspend fun <T> await(t: T, c: Continuation<T>) {
+    suspend fun <T> await(t: T): T = suspendWithCurrentContinuation { c ->
         c.resume(t)
     }
 

compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendWithResult(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendWithResult(value: T): T = suspendWithCurrentContinuation { c ->
         c.resume(value)
     }
 }

compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendWithResult(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendWithResult(value: T): T = suspendWithCurrentContinuation { c ->
         c.resume(value)
     }
 }

compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendWithResult(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendWithResult(value: T): T = suspendWithCurrentContinuation { c ->
         c.resume(value)
     }
 }

compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendWithResult(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendWithResult(value: T): T = suspendWithCurrentContinuation { c ->
         c.resume(value)
     }
 }

compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendWithResult(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendWithResult(value: T): T = suspendWithCurrentContinuation { c ->
         c.resume(value)
     }
 }

compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendWithResult(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendWithResult(value: T): T = suspendWithCurrentContinuation { c ->
         c.resume(value)
     }
 }

compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt

@@ -8,7 +8,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendAndLog(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendAndLog(value: T): T = suspendWithCurrentContinuation { c ->
         result += "suspend($value);"
         c.resume(value)
     }

compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendWithResult(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendWithResult(value: T): T = suspendWithCurrentContinuation { c ->
         result += "["
         c.resume(value)
     }

compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt

@@ -4,12 +4,12 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendAndLog(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendAndLog(value: T): T = suspendWithCurrentContinuation { c ->
         result += "suspend($value);"
         c.resume(value)
     }
 
-    suspend fun suspendLogAndThrow(exception: Throwable, c: Continuation<Nothing>) {
+    suspend fun suspendLogAndThrow(exception: Throwable): Nothing = suspendWithCurrentContinuation { c ->
         result += "throw(${exception.message});"
         c.resumeWithException(exception)
     }

compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendAndLog(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendAndLog(value: T): T = suspendWithCurrentContinuation { c ->
         result += "suspend($value);"
         c.resume(value)
     }
@@ -35,4 +35,4 @@ fun box(): String {
     }
 
     return "OK"
-}
+}

compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt

@@ -4,7 +4,7 @@
 class Controller {
     var result = ""
 
-    suspend fun <T> suspendWithResult(value: T, c: Continuation<T>) {
+    suspend fun <T> suspendWithResult(value: T): T = suspendWithCurrentContinuation { c ->
         c.resume(value)
     }
 }

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

@@ -1,6 +1,6 @@
 class Controller {
     var result = false
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(a: String = "abc", i: Int = 2, x: Continuation<String>) {
+    suspend fun suspendHere(a: String = "abc", i: Int = 2): String = suspendWithCurrentContinuation { x ->
         x.resume(a + "#" + (i + 1))
     }
 

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

@@ -1,7 +1,7 @@
 var result = 0
 
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         result++
         x.resume("OK")
     }

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun <T> suspendHere(v: T, x: Continuation<T>) {
+    suspend fun <T> suspendHere(v: T): T = suspendWithCurrentContinuation { x ->
         x.resume(v)
     }
 

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

@@ -43,7 +43,7 @@ class GeneratorController<T>() : AbstractIterator<T>() {
         this.nextStep = step
     }
 
-    suspend fun yield(value: T, c: Continuation<Unit>) {
+    suspend fun yield(value: T): Unit = suspendWithCurrentContinuation { c ->
         setNext(value)
         setNextStep(c)
     }

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

@@ -3,13 +3,13 @@ class Controller {
     var exception: Throwable? = null
     val postponedActions = ArrayList<() -> Unit>()
 
-    suspend fun suspendWithValue(v: String, x: Continuation<String>) {
+    suspend fun suspendWithValue(v: String): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resume(v)
         }
     }
 
-    suspend fun suspendWithException(e: Exception, x: Continuation<String>) {
+    suspend fun suspendWithException(e: Exception): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resumeWithException(e)
         }

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

@@ -1,6 +1,6 @@
 class Controller {
     var isCompleted = false
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,7 +1,7 @@
 class Controller {
     var log = ""
 
-    suspend fun <T> suspendAndLog(value: T, x: Continuation<T>) {
+    suspend fun <T> suspendAndLog(value: T): T = suspendWithCurrentContinuation { x ->
         log += "suspend($value);"
         x.resume(value)
     }

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

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // NO_INTERCEPT_RESUME_TESTS
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

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

@@ -8,17 +8,13 @@ class Controller {
         x.resume(v)
     }
 
-    suspend inline fun suspendInline(v: String, x: Continuation<String>) {
+    suspend inline fun suspendInline(v: String): String = suspendWithCurrentContinuation { x ->
         withValue(v, x)
     }
 
-    suspend inline fun suspendInline(crossinline b: () -> String, x: Continuation<String>) {
-        suspendInline(b(), x)
-    }
+    suspend inline fun suspendInline(crossinline b: () -> String): String = suspendInline(b())
 
-    suspend inline fun <reified T : Any> suspendInline(x: Continuation<String>) {
-        suspendInline({ T::class.simpleName!! }, x)
-    }
+    suspend inline fun <reified T : Any> suspendInline(): String = suspendInline({ T::class.simpleName!! })
 
     // INTERCEPT_RESUME_PLACEHOLDER
 }

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

@@ -4,13 +4,13 @@ var wasCalled = false
 class Controller {
     val postponedActions = mutableListOf<() -> Unit>()
 
-    suspend fun suspendWithValue(v: String, x: Continuation<String>) {
+    suspend fun suspendWithValue(v: String): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resume(v)
         }
     }
 
-    suspend fun suspendWithException(e: Exception, x: Continuation<String>) {
+    suspend fun suspendWithException(e: Exception): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resumeWithException(e)
         }

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

@@ -1,6 +1,6 @@
 class Controller {
     var i = 0
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume((i++).toString())
     }
 

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

@@ -2,12 +2,12 @@
 // WITH_REFLECT
 
 class Controller {
-    suspend fun runInstanceOf(x: Continuation<Boolean>) {
+    suspend fun runInstanceOf(): Boolean = suspendWithCurrentContinuation { x ->
         val y: Any = x
         x.resume(x is Continuation<*>)
     }
 
-    suspend fun runCast(x: Continuation<Boolean>) {
+    suspend fun runCast(): Boolean = suspendWithCurrentContinuation { x ->
         val y: Any = x
         x.resume(Continuation::class.isInstance(y as Continuation<*>))
     }

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // TARGET_BACKEND: JVM
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // TARGET_BACKEND: JVM
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,6 +1,6 @@
 class Controller {
     var result = "fail"
-    suspend fun <V> suspendHere(v: V, x: Continuation<V>) {
+    suspend fun <V> suspendHere(v: V): V = suspendWithCurrentContinuation { x ->
         x.resume(v)
     }
 

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(v: String, x: Continuation<String>) {
+    suspend fun suspendHere(v: String): String = suspendWithCurrentContinuation { x ->
         x.resume(v)
     }
 

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

@@ -1,7 +1,7 @@
 class Controller {
     var result = ""
     var ok = false
-    suspend fun suspendHere(v: String, x: Continuation<Unit>) {
+    suspend fun suspendHere(v: String): Unit = suspendWithCurrentContinuation { x ->
         result += v
         x.resume(Unit)
     }

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

@@ -1,6 +1,6 @@
 class Controller {
     var wasHandleResultCalled = false
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,6 +1,6 @@
 class Controller {
     var wasHandleResultCalled = false
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,7 +1,7 @@
 class Controller {
     var ok = false
     var v  = "fail"
-    suspend fun suspendHere(v: String, x: Continuation<Unit>) {
+    suspend fun suspendHere(v: String): Unit = suspendWithCurrentContinuation { x ->
         this.v = v
         x.resume(Unit)
     }

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

@@ -1,5 +1,6 @@
+// WITH_RUNTIME
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 
@@ -13,11 +14,11 @@ fun builder(coroutine c: Controller.() -> Continuation<Unit>) {
 fun box(): String {
     var result = "fail"
 
-    val lambda: Controller.() -> Continuation<Unit> = {
+    val lambda: Controller.() -> Continuation<Unit> = l1@{
         object : Continuation<Any?> {
             override fun resume(data: Any?) {
                 if (data == Unit) {
-                    suspendHere(this)
+                    this@l1.javaClass.getMethod("suspendHere", Continuation::class.java).invoke(this@l1, this)
                     return
                 }
 

compiler/testData/codegen/box/coroutines/multiModule/simple.kt

@@ -3,7 +3,7 @@
 package lib
 
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

compiler/testData/codegen/box/coroutines/multiModule/suspendExtension.kt

@@ -4,36 +4,26 @@ package lib
 
 @AllowSuspendExtensions
 class Controller {
-    suspend fun String.suspendHere(x: Continuation<String>) {
+    suspend fun String.suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume(this)
     }
 
-    inline suspend fun String.inlineSuspendHere(x: Continuation<String>) {
-        suspendHere(x)
-    }
+    inline suspend fun String.inlineSuspendHere(): String = suspendHere()
 
     // INTERCEPT_RESUME_PLACEHOLDER
 }
 
-suspend fun Controller.suspendExtension(v: String, x: Continuation<String>) {
-    v.suspendHere(x)
-}
+suspend fun Controller.suspendExtension(v: String): String = v.suspendHere()
 
-inline suspend fun Controller.inlineSuspendExtension(v: String, x: Continuation<String>) {
-    v.inlineSuspendHere(x)
-}
+inline suspend fun Controller.inlineSuspendExtension(v: String) = v.inlineSuspendHere()
 
 // MODULE: main(controller)
 // FILE: main.kt
 import lib.*
 
-suspend fun Controller.localSuspendExtension(v: String, x: Continuation<String>) {
-    v.suspendHere(x)
-}
+suspend fun Controller.localSuspendExtension(v: String) = v.suspendHere()
 
-inline suspend fun Controller.localInlineSuspendExtension(v: String, x: Continuation<String>) {
-    v.inlineSuspendHere(x)
-}
+inline suspend fun Controller.localInlineSuspendExtension(v: String) = v.inlineSuspendHere()
 
 fun builder(coroutine c: Controller.() -> Continuation<Unit>) {
     c(Controller()).resume(Unit)

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

@@ -1,8 +1,9 @@
 class Controller {
     var lastSuspension: Continuation<String>? = null
     var result = "fail"
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         lastSuspension = x
+        Unit
     }
 
     fun hasNext() = lastSuspension != null

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

@@ -1,8 +1,9 @@
 class Controller {
     var lastSuspension: Continuation<String>? = null
     var result = "fail"
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         lastSuspension = x
+        Unit
     }
 
     fun hasNext() = lastSuspension != null

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

@@ -1,8 +1,9 @@
 class Controller {
     var lastSuspension: Continuation<String>? = null
     var result = "fail"
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         lastSuspension = x
+        Unit
     }
 
     fun hasNext() = lastSuspension != null

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

@@ -1,8 +1,9 @@
 class Controller {
     var lastSuspension: Continuation<String>? = null
     var result = "fail"
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         lastSuspension = x
+        Unit
     }
 
     fun hasNext() = lastSuspension != null

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

@@ -4,13 +4,13 @@ var wasCalled = false
 class Controller {
     val postponedActions = ArrayList<() -> Unit>()
 
-    suspend fun suspendWithValue(v: String, x: Continuation<String>) {
+    suspend fun suspendWithValue(v: String): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resume(v)
         }
     }
 
-    suspend fun suspendWithException(e: Exception, x: Continuation<String>) {
+    suspend fun suspendWithException(e: Exception): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resumeWithException(e)
         }

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

@@ -1,6 +1,6 @@
 class Controller {
     var cResult = 0
-    suspend fun suspendHere(v: Int, x: Continuation<Int>) {
+    suspend fun suspendHere(v: Int): Int = suspendWithCurrentContinuation { x ->
         x.resume(v * 2)
     }
 

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

@@ -2,7 +2,7 @@
 
 class Controller {
     var cResult = 0
-    suspend fun suspendHere(v: Int, x: Continuation<Int>) {
+    suspend fun suspendHere(v: Int): Int = suspendWithCurrentContinuation { x ->
         x.resume(v * 2)
     }
 

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

@@ -1,6 +1,6 @@
 class Controller {
     var res = 0
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resumeWithException(RuntimeException("OK"))
     }
 

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

@@ -1,6 +1,6 @@
 class Controller {
     var res = 0
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,6 +1,6 @@
 var globalResult = ""
 class Controller {
-    suspend fun suspendWithValue(v: String, x: Continuation<String>) {
+    suspend fun suspendWithValue(v: String): String = suspendWithCurrentContinuation { x ->
         x.resume(v)
     }
 

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

@@ -1,9 +1,7 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
-        suspendThere(x)
-    }
+    suspend fun suspendHere(): String = suspendThere()
 
-    suspend fun suspendThere(x: Continuation<String>) {
+    suspend fun suspendThere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,23 +1,17 @@
 @AllowSuspendExtensions
 class Controller {
-    suspend fun String.suspendHere(x: Continuation<String>) {
+    suspend fun String.suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume(this)
     }
 
-    inline suspend fun String.inlineSuspendHere(x: Continuation<String>) {
-        suspendHere(x)
-    }
+    inline suspend fun String.inlineSuspendHere(): String = suspendHere()
 
     // INTERCEPT_RESUME_PLACEHOLDER
 }
 
-suspend fun Controller.suspendExtension(v: String, x: Continuation<String>) {
-    v.suspendHere(x)
-}
+suspend fun Controller.suspendExtension(v: String): String = v.suspendHere()
 
-inline suspend fun Controller.inlineSuspendExtension(v: String, x: Continuation<String>) {
-    v.inlineSuspendHere(x)
-}
+inline suspend fun Controller.inlineSuspendExtension(v: String): String = v.inlineSuspendHere()
 
 fun builder(coroutine c: Controller.() -> Continuation<Unit>) {
     c(Controller()).resume(Unit)

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(v: Int, x: Continuation<Int>) {
+    suspend fun suspendHere(v: Int): Int = suspendWithCurrentContinuation { x ->
         x.resume(v * 2)
     }
 

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

@@ -1,9 +1,9 @@
 class Controller {
     var i = 0
-    suspend fun suspendHere(x: Continuation<Int>) {
+    suspend fun suspendHere(): Int = suspendWithCurrentContinuation { x ->
         x.resume(i++)
     }
-    suspend fun suspendThere(x: Continuation<String>) {
+    suspend fun suspendThere(): String = suspendWithCurrentContinuation { x ->
         x.resume("?")
     }
 

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

@@ -1,13 +1,13 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("K")
     }
 
-    suspend fun suspendWithArgument(v: String, x: Continuation<String>) {
+    suspend fun suspendWithArgument(v: String): String = suspendWithCurrentContinuation { x ->
         x.resume(v)
     }
 
-    suspend fun suspendWithDouble(v: Double, x: Continuation<Double>) {
+    suspend fun suspendWithDouble(v: Double): Double = suspendWithCurrentContinuation { x ->
         x.resume(v)
     }
 

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

@@ -4,13 +4,13 @@ var wasCalled = false
 class Controller {
     val postponedActions = ArrayList<() -> Unit>()
 
-    suspend fun suspendWithValue(v: String, x: Continuation<String>) {
+    suspend fun suspendWithValue(v: String): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resume(v)
         }
     }
 
-    suspend fun suspendWithException(e: Exception, x: Continuation<String>) {
+    suspend fun suspendWithException(e: Exception): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resumeWithException(e)
         }

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

@@ -4,13 +4,13 @@ var wasCalled = false
 class Controller {
     val postponedActions = ArrayList<() -> Unit>()
 
-    suspend fun suspendWithValue(v: String, x: Continuation<String>) {
+    suspend fun suspendWithValue(v: String): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resume(v)
         }
     }
 
-    suspend fun suspendWithException(e: Exception, x: Continuation<String>) {
+    suspend fun suspendWithException(e: Exception): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resumeWithException(e)
         }

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(v: String, x: Continuation<String>) {
+    suspend fun suspendHere(v: String): String = suspendWithCurrentContinuation { x ->
         x.resume(v)
     }
 

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

@@ -4,13 +4,13 @@ var wasCalled = false
 class Controller {
     val postponedActions = mutableListOf<() -> Unit>()
 
-    suspend fun suspendWithValue(v: String, x: Continuation<String>) {
+    suspend fun suspendWithValue(v: String): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resume(v)
         }
     }
 
-    suspend fun suspendWithException(e: Exception, x: Continuation<String>) {
+    suspend fun suspendWithException(e: Exception): String = suspendWithCurrentContinuation { x ->
         postponedActions.add {
             x.resumeWithException(e)
         }

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

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

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 

compiler/testData/codegen/box/reflection/modifiers/functions.kt

@@ -10,7 +10,8 @@ inline fun inline() {}
 class External { external fun external() }
 operator fun Unit.invoke() {}
 infix fun Unit.infix(unit: Unit) {}
-class Suspend { suspend fun suspend(c: Continuation<Unit>) {} }
+// TODO: support or prohibit references to suspend functions
+// class Suspend { suspend fun suspend(c: Continuation<Unit>) {} }
 
 val externalGetter = Unit
     external get
@@ -44,11 +45,11 @@ fun box(): String {
     assertTrue(Unit::infix.isInfix)
     assertFalse(Unit::infix.isSuspend)
 
-    assertFalse(Suspend::suspend.isInline)
-    assertFalse(Suspend::suspend.isExternal)
-    assertFalse(Suspend::suspend.isOperator)
-    assertFalse(Suspend::suspend.isInfix)
-    assertTrue(Suspend::suspend.isSuspend)
+//    assertFalse(Suspend::suspend.isInline)
+//    assertFalse(Suspend::suspend.isExternal)
+//    assertFalse(Suspend::suspend.isOperator)
+//    assertFalse(Suspend::suspend.isInfix)
+//    assertTrue(Suspend::suspend.isSuspend)
 
     assertTrue(::externalGetter.getter.isExternal)
     assertFalse(::externalGetter.getter.isInline)

compiler/testData/codegen/bytecodeListing/coroutineFields.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere() = suspendWithCurrentContinuation<String> { x ->
         x.resume("OK")
     }
 }

compiler/testData/codegen/bytecodeText/constCoroutine.kt

@@ -1,6 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
-    }
+    suspend fun suspendHere() = ""
 }
 
 

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt

@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt

@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<Unit>) {
+    suspend fun suspendHere(): Unit = suspendWithCurrentContinuation { x ->
         x.resume(Unit)
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 }

compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt

@@ -1,5 +1,5 @@
 class Controller {
-    suspend fun suspendHere(x: Continuation<String>) {
+    suspend fun suspendHere(): String = suspendWithCurrentContinuation { x ->
         x.resume("OK")
     }
 }

compiler/testData/codegen/java8/box/async.kt

@@ -53,7 +53,7 @@ class FutureController<T> {
     val future = CompletableFuture<T>()
 
 
-    suspend fun <V> await(f: CompletableFuture<V>, machine: Continuation<V>) {
+    suspend fun <V> await(f: CompletableFuture<V>) = suspendWithCurrentContinuation<V> { machine ->
         f.whenComplete { value, throwable ->
             if (throwable == null)
                 machine.resume(value)

compiler/testData/codegen/java8/box/asyncException.kt

@@ -49,7 +49,7 @@ fun <T> async(coroutine c: FutureController<T>.() -> Continuation<Unit>): Comple
 class FutureController<T> {
     val future = CompletableFuture<T>()
 
-    suspend fun <V> await(f: CompletableFuture<V>, machine: Continuation<V>) {
+    suspend fun <V> await(f: CompletableFuture<V>) = suspendWithCurrentContinuation<V> { machine ->
         f.whenComplete { value, throwable ->
             if (throwable == null)
                 machine.resume(value)