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

JVM_IR: Return COROUTINE_SUSPENDED from suspend main wrapper

Browse Source 
Before, if the code inside suspend main suspended, the wrapper would
just ignore it and return Unit. This was a signal for runSuspend to exit
main loop and return said Unit.
Instead of poping whatever suspend main returns, just return it.
This commit is contained in:
Ilmir Usmanov
2020-02-20 18:08:43 +01:00
parent 5b62c9e54d
commit 8c4eef9844
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt
+9 -7
View File
@@ -29,7 +29,9 @@ import org.jetbrains.kotlin.ir.declarations.IrValueParameter
import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionReferenceImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
import org.jetbrains.kotlin.ir.util.functions
import org.jetbrains.kotlin.ir.util.isFileClass
import org.jetbrains.kotlin.name.Name
@@ -81,9 +83,9 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex
if (mainMethod.isSuspend) {
generateMainMethod(irClass) { args ->
body = buildRunSuspendWrapper {
+irCall(mainMethod).apply {
+IrReturnImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, context.irBuiltIns.nothingType, it, irCall(mainMethod).apply {
putValueArgument(0, irGet(args))
}
})
}
}
}
@@ -94,7 +96,7 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex
generateMainMethod(irClass) {
body = if (parameterlessMainMethod.isSuspend) {
buildRunSuspendWrapper {
+irCall(parameterlessMainMethod)
+IrReturnImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, context.irBuiltIns.nothingType, it, irCall(parameterlessMainMethod))
}
} else {
context.createIrBuilder(symbol).irBlockBody {
@@ -147,19 +149,19 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex
}
}
private fun IrFunctionImpl.buildRunSuspendWrapper(buildMainInvocation: IrBlockBodyBuilder.() -> Unit) =
private fun IrFunctionImpl.buildRunSuspendWrapper(buildMainInvocation: IrBlockBodyBuilder.(IrSimpleFunctionSymbol) -> Unit) =
context.createJvmIrBuilder(symbol).irBlockBody {
val lambda = irBlock(UNDEFINED_OFFSET, UNDEFINED_OFFSET, IrStatementOrigin.LAMBDA) {
val function = buildFun {
origin = IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA
name = Name.identifier("wrapper_for_suspend_main")
visibility = Visibilities.LOCAL
returnType = context.irBuiltIns.unitType
returnType = context.irBuiltIns.anyNType
}.apply {
addValueParameter("k", context.irBuiltIns.anyNType)
parent = this
body = irBlockBody {
buildMainInvocation()
buildMainInvocation(symbol)
}
}
+function
@@ -168,7 +170,7 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex
UNDEFINED_OFFSET,
context.irBuiltIns.function1.typeWith(
context.irBuiltIns.anyNType,
context.irBuiltIns.unitType
context.irBuiltIns.anyNType
),
function.symbol,
typeArgumentsCount = 0,