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

Coroutines lowering: fixed bug appeared after merging with IR symbols

Browse Source
This commit is contained in:
Igor Chevdar
2017-05-10 16:41:51 +03:00
parent 81a0aa1861
commit 29c30545e5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SuspendFunctionsLowering.kt
+6 -1
View File
@@ -180,7 +180,11 @@ internal class SuspendFunctionsLowering(val context: Context): DeclarationContai
private fun getSuspendFunctionKind(irFunction: IrFunction): SuspendFunctionKind { private fun getSuspendFunctionKind(irFunction: IrFunction): SuspendFunctionKind {
if (suspendLambdas.contains(irFunction.descriptor)) if (suspendLambdas.contains(irFunction.descriptor))
return SuspendFunctionKind.NEEDS_STATE_MACHINE // Suspend lambdas always need coroutine implementation. return SuspendFunctionKind.NEEDS_STATE_MACHINE // Suspend lambdas always need coroutine implementation.
val body = irFunction.body!!
val body = irFunction.body
if (body == null)
return SuspendFunctionKind.NO_SUSPEND_CALLS
var numberOfSuspendCalls = 0 var numberOfSuspendCalls = 0
body.acceptVoid(object: IrElementVisitorVoid { body.acceptVoid(object: IrElementVisitorVoid {
override fun visitElement(element: IrElement) { override fun visitElement(element: IrElement) {
@@ -197,6 +201,7 @@ internal class SuspendFunctionsLowering(val context: Context): DeclarationContai
// It is important to optimize the case where there is only one suspend call and it is the last statement // It is important to optimize the case where there is only one suspend call and it is the last statement
// because we don't need to build a fat coroutine class in that case. // because we don't need to build a fat coroutine class in that case.
// This happens a lot in practise because of suspend functions with default arguments. // This happens a lot in practise because of suspend functions with default arguments.
// TODO: use TailRecursionCallsCollector.
val lastStatement = (body as IrBlockBody).statements.lastOrNull() val lastStatement = (body as IrBlockBody).statements.lastOrNull()
val lastCall = when (lastStatement) { val lastCall = when (lastStatement) {
is IrCall -> lastStatement is IrCall -> lastStatement