azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JVM_IR: actually forward the parameters to $suspendImpl

Browse Source
This commit is contained in:
pyos
2020-01-14 11:01:02 +01:00
committed by Ilmir Usmanov
parent 54285d328f
commit f73891af98
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt
+2 -8
View File
@@ -502,7 +502,6 @@ private class AddContinuationLowering(private val context: JvmBackendContext) :
private fun createStaticSuspendImpl(irFunction: IrSimpleFunction): IrSimpleFunction { private fun createStaticSuspendImpl(irFunction: IrSimpleFunction): IrSimpleFunction {
// Create static suspend impl method. // Create static suspend impl method.
val backendContext = context
val static = createStaticFunctionWithReceivers( val static = createStaticFunctionWithReceivers(
irFunction.parent, irFunction.parent,
irFunction.name.toSuspendImplementationName(), irFunction.name.toSuspendImplementationName(),
@@ -522,15 +521,10 @@ private class AddContinuationLowering(private val context: JvmBackendContext) :
it.putValueArgument(i++, irGet(irFunction.dispatchReceiverParameter!!)) it.putValueArgument(i++, irGet(irFunction.dispatchReceiverParameter!!))
} }
if (irFunction.extensionReceiverParameter != null) { if (irFunction.extensionReceiverParameter != null) {
val defaultValueForParameter = irFunction.extensionReceiverParameter!!.type.defaultValue( it.putValueArgument(i++, irGet(irFunction.extensionReceiverParameter!!))
UNDEFINED_OFFSET, UNDEFINED_OFFSET, backendContext
)
it.putValueArgument(i++, defaultValueForParameter)
} }
for (parameter in irFunction.valueParameters) { for (parameter in irFunction.valueParameters) {
val defaultValueForParameter = parameter.type.defaultValue(UNDEFINED_OFFSET, UNDEFINED_OFFSET, backendContext) it.putValueArgument(i++, irGet(parameter))
it.putValueArgument(i++, defaultValueForParameter)
} }
}) })
} }
compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt
Vendored
+3 -3
View File
@@ -12,11 +12,11 @@ open class A(val v: String) {
COROUTINE_SUSPENDED COROUTINE_SUSPENDED
} }
open suspend fun suspendHere(): String = suspendThere("O") + suspendThere(v) open suspend fun suspendHere(x: String): String = suspendThere(x) + suspendThere(v)
} }
class B(v: String) : A(v) { class B(v: String) : A(v) {
override suspend fun suspendHere(): String = super.suspendHere() + suspendThere("56") override suspend fun suspendHere(x: String): String = super.suspendHere(x) + suspendThere("56")
} }
fun builder(c: suspend A.() -> Unit) { fun builder(c: suspend A.() -> Unit) {
@@ -27,7 +27,7 @@ fun box(): String {
var result = "" var result = ""
builder { builder {
result = suspendHere() result = suspendHere("O")
} }
if (result != "OK56") return "fail 1: $result" if (result != "OK56") return "fail 1: $result"