KJS: fix non-local return inside catch block

compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromCatchBlock.kt

@@ -0,0 +1,54 @@
+// MODULE: lib
+// FILE: lib.kt
+
+package utils
+
+inline fun foo(a: Int) {
+    bar(a)
+}
+
+inline fun bar(a: Int) {
+    try {
+        if (a > 0) throw Exception()
+        log("foo($a) #1")
+    }
+    catch (e: Exception) {
+        myRun {
+            log("foo($a) #2")
+            if (a > 1) return
+            log("foo($a) #3")
+        }
+    }
+    log("foo($a) #4")
+}
+
+var LOG: String = ""
+
+fun log(s: String): String {
+    LOG += s + ";"
+    return LOG
+}
+
+inline fun myRun(f: () -> Unit) = f()
+
+
+// MODULE: main(lib)
+// FILE: main.kt
+
+import utils.*
+
+fun box(): String {
+    foo(0)
+    if (LOG != "foo(0) #1;foo(0) #4;") return "fail1: $LOG"
+    LOG = ""
+
+    foo(1)
+    if (LOG != "foo(1) #2;foo(1) #3;foo(1) #4;") return "fail2: $LOG"
+    LOG = ""
+
+    foo(2)
+    if (LOG != "foo(2) #2;") return "fail3: $LOG"
+    LOG = ""
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnToCatchBlock.kt

@@ -0,0 +1,51 @@
+// MODULE: lib
+// FILE: lib.kt
+
+package utils
+
+inline fun foo(a: Int) {
+    try {
+        if (a > 0) throw Exception()
+        log("foo($a)")
+    }
+    catch (e: Exception) {
+        bar(a)
+    }
+}
+
+inline fun bar(a: Int) {
+    myRun {
+        log("bar($a) #1")
+        if (a == 2) return
+        log("bar($a) #2")
+    }
+}
+
+var LOG: String = ""
+
+fun log(s: String): String {
+    LOG += s + ";"
+    return LOG
+}
+
+inline fun myRun(f: () -> Unit) = f()
+
+// MODULE: main(lib)
+// FILE: main.kt
+
+import utils.*
+
+fun box(): String {
+    foo(0)
+    if (LOG != "foo(0);") return "fail1: $LOG"
+    LOG = ""
+
+    foo(1)
+    if (LOG != "bar(1) #1;bar(1) #2;") return "fail2: $LOG"
+    LOG = ""
+
+    foo(2)
+    if (LOG != "bar(2) #1;") return "fail3: $LOG"
+
+    return "OK"
+}

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java

@@ -1387,12 +1387,24 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
                 doTest(fileName);
             }
 
+            @TestMetadata("nonLocalReturnFromCatchBlock.kt")
+            public void testNonLocalReturnFromCatchBlock() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromCatchBlock.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("nonLocalReturnFromOuterLambda.kt")
             public void testNonLocalReturnFromOuterLambda() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromOuterLambda.kt");
                 doTest(fileName);
             }
 
+            @TestMetadata("nonLocalReturnToCatchBlock.kt")
+            public void testNonLocalReturnToCatchBlock() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnToCatchBlock.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)

compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java

@@ -1387,12 +1387,24 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
                 doTest(fileName);
             }
 
+            @TestMetadata("nonLocalReturnFromCatchBlock.kt")
+            public void testNonLocalReturnFromCatchBlock() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromCatchBlock.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("nonLocalReturnFromOuterLambda.kt")
             public void testNonLocalReturnFromOuterLambda() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromOuterLambda.kt");
                 doTest(fileName);
             }
 
+            @TestMetadata("nonLocalReturnToCatchBlock.kt")
+            public void testNonLocalReturnToCatchBlock() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnToCatchBlock.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)