JVM_IR: place suspend markers in faux lambdas around inline references
Otherwise, the assumption that coroutine codegen makes about every inlined function already having the markers breaks and it is no longer true that calls to inline lambdas do not require them.
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
// WITH_RUNTIME
|
||||
// WITH_COROUTINES
|
||||
// NO_CHECK_LAMBDA_INLINING
|
||||
// FILE: 1.kt
|
||||
import kotlin.coroutines.intrinsics.*
|
||||
import kotlin.coroutines.*
|
||||
|
||||
class Delayed(val run: suspend() -> Unit)
|
||||
|
||||
inline fun asyncThenAddK(crossinline block: suspend () -> Unit) =
|
||||
Delayed {
|
||||
block()
|
||||
result += "K"
|
||||
}
|
||||
|
||||
suspend fun pause(): Unit = suspendCoroutineUninterceptedOrReturn { cont ->
|
||||
cont.resume(Unit)
|
||||
COROUTINE_SUSPENDED
|
||||
}
|
||||
|
||||
var result = ""
|
||||
|
||||
suspend fun addO(): Unit {
|
||||
pause()
|
||||
result += "O"
|
||||
}
|
||||
|
||||
// FILE: 2.kt
|
||||
import kotlin.coroutines.intrinsics.*
|
||||
import kotlin.coroutines.*
|
||||
import helpers.*
|
||||
|
||||
fun box(): String {
|
||||
suspend { asyncThenAddK(::addO).run() }.startCoroutine(EmptyContinuation)
|
||||
return result
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
// WITH_RUNTIME
|
||||
// WITH_COROUTINES
|
||||
// NO_CHECK_LAMBDA_INLINING
|
||||
// FILE: 1.kt
|
||||
import kotlin.coroutines.intrinsics.*
|
||||
import kotlin.coroutines.*
|
||||
|
||||
class Delayed(val run: suspend() -> Unit)
|
||||
|
||||
inline fun async(crossinline block: suspend () -> Unit) =
|
||||
Delayed { block() }
|
||||
|
||||
suspend fun pause(): Unit = suspendCoroutineUninterceptedOrReturn { cont ->
|
||||
cont.resume(Unit)
|
||||
COROUTINE_SUSPENDED
|
||||
}
|
||||
|
||||
var result = ""
|
||||
|
||||
suspend fun addOK(): Unit {
|
||||
pause()
|
||||
result += "OK"
|
||||
}
|
||||
|
||||
// FILE: 2.kt
|
||||
import kotlin.coroutines.intrinsics.*
|
||||
import kotlin.coroutines.*
|
||||
import helpers.*
|
||||
|
||||
fun box(): String {
|
||||
suspend { async(::addOK).run() }.startCoroutine(EmptyContinuation)
|
||||
return result
|
||||
}
|
||||
Reference in New Issue
Block a user