JVM_IR: Support inner lambdas which capture crossinline

2019-12-09 19:50:50 +03:00
parent daa76cbf1e
commit 9292022f88
7 changed files with 16 additions and 10 deletions
@@ -652,11 +652,20 @@ private class AddContinuationLowering(private val context: JvmBackendContext) :
                expression.acceptChildrenVoid(this)

                if (expression.isSuspend && expression !in inlineLambdas && expression.origin == IrStatementOrigin.LAMBDA) {
+                    var expressionCapturesCrossinline = false
+                    for (i in 0 until expression.valueArgumentsCount) {
+                        val getValue = expression.getValueArgument(i) as? IrGetValue ?: continue
+                        val owner = getValue.symbol.owner as? IrValueParameter ?: continue
+                        if (owner.isCrossinline) {
+                            expressionCapturesCrossinline = true
+                            break
+                        }
+                    }
                    suspendLambdas += SuspendLambdaInfo(
                        expression.symbol.owner,
                        (expression.type as IrSimpleType).arguments.size - 1,
                        expression,
-                        expression in capturesCrossinline
+                        expressionCapturesCrossinline || expression in capturesCrossinline
                    )
                }
            }