From 30b060249214e5dbec10969fc5494540ec5cace6 Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Thu, 20 Sep 2018 15:59:02 +0300
Subject: [PATCH] Fix of https://youtrack.jetbrains.com/issue/KT-26317

---
 .../backend/konan/lower/FunctionInlining.kt     |  6 ++++--
 .../konan/lower/SharedVariablesLowering.kt      | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
index 9dbe0996494..91f26b6711f 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
@@ -143,7 +143,7 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
           }
      }
 
-     private fun inlineFunction(callee: IrCall,                                             // Call to be substituted.
+    private fun inlineFunction(callee: IrCall,                                             // Call to be substituted.
                                caller: IrFunction): IrReturnableBlockImpl {                 // Function to substitute.
 
         val copyFunctionDeclaration = copyIrElement.copy(                         // Create copy of original function.
@@ -194,12 +194,14 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
         val returnType = substitutedDescriptor?.let { context.ir.translateErased((it.descriptor as ClassDescriptor).defaultType) }
                 ?: copyFunctionDeclaration.returnType
 
+        val isCoroutineIntrinsicCall = callee.descriptor.isBuiltInSuspendCoroutineUninterceptedOrReturn(context.config.configuration.languageVersionSettings)
+
         return IrReturnableBlockImpl(                                     // Create new IR element to replace "call".
             startOffset = startOffset,
             endOffset   = endOffset,
             type        = returnType,
             symbol      = irReturnableBlockSymbol,
-            origin      = null,
+            origin      = if (isCoroutineIntrinsicCall) CoroutineIntrinsicLambdaOrigin else null,
             statements  = statements,
             sourceFileName = sourceFileName
         )
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SharedVariablesLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SharedVariablesLowering.kt
index 9b868a84709..25019f9fafe 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SharedVariablesLowering.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SharedVariablesLowering.kt
@@ -10,15 +10,14 @@ import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrVariable
-import org.jetbrains.kotlin.ir.expressions.IrExpression
-import org.jetbrains.kotlin.ir.expressions.IrGetValue
-import org.jetbrains.kotlin.ir.expressions.IrSetVariable
-import org.jetbrains.kotlin.ir.expressions.IrValueAccessExpression
+import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
 import org.jetbrains.kotlin.ir.symbols.IrVariableSymbol
 import org.jetbrains.kotlin.ir.visitors.*
 import java.util.*
 
+object CoroutineIntrinsicLambdaOrigin: IrStatementOriginImpl("Coroutine intrinsic lambda")
+
 // TODO: Fix .parent for variables and use from common backend.
 class SharedVariablesLowering(val context: BackendContext) : FunctionLoweringPass {
     override fun lower(irFunction: IrFunction) {
@@ -50,6 +49,16 @@ class SharedVariablesLowering(val context: BackendContext) : FunctionLoweringPas
                     functionsVariables.pop()
                 }
 
+                override fun visitContainerExpression(expression: IrContainerExpression) {
+                    if (expression !is IrReturnableBlock || expression.origin != CoroutineIntrinsicLambdaOrigin)
+                        super.visitContainerExpression(expression)
+                    else {
+                        functionsVariables.push(mutableSetOf())
+                        expression.acceptChildrenVoid(this)
+                        functionsVariables.pop()
+                    }
+                }
+
                 override fun visitVariable(declaration: IrVariable) {
                     declaration.acceptChildrenVoid(this)