From 74e1783e2b7adae460fb6221a5271a824ce0e5f6 Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Mon, 21 May 2018 13:44:42 +0300
Subject: [PATCH] Fixed bug in <when> codegen  + test

---
 .../kotlin/backend/konan/llvm/IrToBitcode.kt  |  2 ++
 backend.native/tests/build.gradle             |  5 +++++
 .../tests/codegen/branching/when_with_try1.kt | 22 +++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 backend.native/tests/codegen/branching/when_with_try1.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 5d5c9d2f471..471ee597305 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
@@ -2449,6 +2449,8 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
                 functionGenerationContext.assignPhis(resultPhi to brResult)
             if (bbExit != null)
                 functionGenerationContext.br(bbExit)
+            else
+                functionGenerationContext.unreachable()
         }
         if (bbNext != null)                                                          // Switch generation to next or exit.
             functionGenerationContext.positionAtEnd(bbNext)
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 47dcf0dc370..91049b27b14 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -1370,6 +1370,11 @@ task advanced_when5(type: RunKonanTest) {
     source = "codegen/branching/advanced_when5.kt"
 }
 
+task when_with_try1(type: RunKonanTest) {
+    goldValue = "null\nnull\n42\n"
+    source = "codegen/branching/when_with_try1.kt"
+}
+
 task bool_yes(type: RunKonanTest) {
     source = "codegen/function/boolean.kt"
 }
diff --git a/backend.native/tests/codegen/branching/when_with_try1.kt b/backend.native/tests/codegen/branching/when_with_try1.kt
new file mode 100644
index 00000000000..28266ecdf85
--- /dev/null
+++ b/backend.native/tests/codegen/branching/when_with_try1.kt
@@ -0,0 +1,22 @@
+package codegen.branching.when_with_try1
+
+import kotlin.test.*
+
+@Test fun runTest() {
+    println(foo(Any()))
+    println(foo("zzz"))
+    println(foo("42"))
+}
+
+fun foo(value: Any): Int? {
+    if (value is CharSequence) {
+        try {
+            return value.toString().toInt()
+        } catch (e: NumberFormatException) {
+            return null
+        }
+    }
+    else {
+        return null
+    }
+}
\ No newline at end of file