From 056435a9e5e97fd0fb48c7361b0d374b46b687d5 Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Fri, 28 Feb 2020 17:10:05 +0300
Subject: [PATCH] Fix for https://youtrack.jetbrains.com/issue/KT-36980

---
 .../kotlin/backend/konan/llvm/IrToBitcode.kt  |  6 +----
 .../konan/lower/ReturnsInsertionLowering.kt   | 18 +++++++++++----
 backend.native/tests/build.gradle             |  5 +++++
 .../tests/codegen/inline/coercionToUnit.kt    | 22 +++++++++++++++++++
 4 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 backend.native/tests/codegen/inline/coercionToUnit.kt

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
index cf3045dad1f..f9f431794b4 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
@@ -1818,11 +1818,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         val bbExit = returnableBlockScope.bbExit
         if (bbExit != null) {
             if (!functionGenerationContext.isAfterTerminator()) {                 // TODO should we solve this problem once and for all
-                if (returnableBlockScope.resultPhi != null) {
-                    functionGenerationContext.unreachable()
-                } else {
-                    functionGenerationContext.br(bbExit)
-                }
+                functionGenerationContext.unreachable()
             }
             functionGenerationContext.positionAtEnd(bbExit)
         }
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ReturnsInsertionLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ReturnsInsertionLowering.kt
index 40dcb357975..0fd0d495405 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ReturnsInsertionLowering.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ReturnsInsertionLowering.kt
@@ -14,8 +14,7 @@ import org.jetbrains.kotlin.ir.builders.irReturn
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrFunction
-import org.jetbrains.kotlin.ir.expressions.IrBlockBody
-import org.jetbrains.kotlin.ir.types.classifierOrNull
+import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
@@ -32,14 +31,25 @@ internal class ReturnsInsertionLowering(val context: Context) : FileLoweringPass
             override fun visitFunction(declaration: IrFunction) {
                 declaration.acceptChildrenVoid(this)
 
-                val body = declaration.body
-                if ((declaration is IrConstructor || declaration.returnType.classifierOrNull == symbols.unit) && body != null) {
+                val body = declaration.body ?: return
+                if (declaration is IrConstructor || declaration.returnType == context.irBuiltIns.unitType) {
                     val irBuilder = context.createIrBuilder(declaration.symbol, declaration.endOffset, declaration.endOffset)
                     irBuilder.run {
                          (body as IrBlockBody).statements += irReturn(irGetObject(symbols.unit))
                     }
                 }
             }
+
+            override fun visitBlock(expression: IrBlock) {
+                expression.acceptChildrenVoid(this)
+                if (expression !is IrReturnableBlock) return
+                if (expression.inlineFunctionSymbol?.owner?.returnType == context.irBuiltIns.unitType) {
+                    val irBuilder = context.createIrBuilder(expression.symbol, expression.endOffset, expression.endOffset)
+                    irBuilder.run {
+                        expression.statements += irReturn(irGetObject(symbols.unit))
+                    }
+                }
+            }
         })
     }
 }
\ No newline at end of file
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 1066fb4a71a..fb968934f2d 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -2994,6 +2994,11 @@ task inline_correctOrderFunctionReference(type: KonanLocalTest) {
     source = "codegen/inline/correctOrderFunctionReference.kt"
 }
 
+task inline_coercionToUnit(type: KonanLocalTest) {
+    goldValue = "kotlin.Unit\n"
+    source = "codegen/inline/coercionToUnit.kt"
+}
+
 task classDeclarationInsideInline(type: KonanLocalTest) {
     source = "codegen/inline/classDeclarationInsideInline.kt"
     goldValue = "test1: 1.0\n1\ntest2\n"
diff --git a/backend.native/tests/codegen/inline/coercionToUnit.kt b/backend.native/tests/codegen/inline/coercionToUnit.kt
new file mode 100644
index 00000000000..58f8700156d
--- /dev/null
+++ b/backend.native/tests/codegen/inline/coercionToUnit.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+package codegen.inline.coercionToUnit
+
+import kotlin.test.*
+
+fun <T> myRun(action: () -> T): T = action()
+
+fun foo(n: Number, b: Boolean) {
+    n.let {
+        if (b) return@let
+
+        myRun() { 42 }
+    }
+}
+
+@Test fun runTest() {
+    println(foo(42, false))
+}