From c0f5d0975973b7af46082b5c9eb13da16fda5ccf Mon Sep 17 00:00:00 2001
From: Mads Ager <ager@google.com>
Date: Tue, 20 Jul 2021 15:23:14 +0200
Subject: [PATCH] Copy locals in addition to instructions when inlining finally
 blocks

^KT-46448 Fixed
---
 .../kotlin/codegen/inline/InlineCodegen.kt    |  3 +++
 .../debug/localVariables/tryFinally10.kt      |  4 ++--
 .../debug/localVariables/tryFinally9.kt       | 20 ++++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt
index 48c6a67aa25..2b5c12bf2ed 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt
@@ -187,6 +187,9 @@ abstract class InlineCodegen<out T : BaseExpressionCodegen>(
                 val splitBy = SimpleInterval(start.info as LabelNode, extension.finallyIntervalEnd)
                 processor.tryBlocksMetaInfo.splitAndRemoveCurrentIntervals(splitBy, true)
                 processor.localVarsMetaInfo.splitAndRemoveCurrentIntervals(splitBy, true)
+                finallyNode.localVariables.forEach {
+                    processor.localVarsMetaInfo.addNewInterval(LocalVarNodeWrapper(it))
+                }
             }
 
             curInstr = curInstr.next
diff --git a/compiler/testData/debug/localVariables/tryFinally10.kt b/compiler/testData/debug/localVariables/tryFinally10.kt
index 1642bb64e8d..17b462d3d2b 100644
--- a/compiler/testData/debug/localVariables/tryFinally10.kt
+++ b/compiler/testData/debug/localVariables/tryFinally10.kt
@@ -23,7 +23,7 @@ fun compute(): String {
         }
     } finally {
         val s2 = "OK"
-        x = s2  // TODO: Why is `s2` not visible here?
+        x = s2
     }
     return "FAIL"
 }
@@ -49,7 +49,7 @@ fun box() {
 // test.kt:10 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int
 // test.kt:21 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, $i$a$-f-TestKt$compute$1:int=0:int
 // test.kt:25 compute:
-// test.kt:26 compute:
+// test.kt:26 compute: s2:java.lang.String="OK":java.lang.String
 // test.kt:32 box:
 // test.kt:33 box: result:java.lang.String="NON_LOCAL_RETURN":java.lang.String
 // test.kt:34 box: result:java.lang.String="NON_LOCAL_RETURN":java.lang.String, localX:java.lang.String="OK":java.lang.String
diff --git a/compiler/testData/debug/localVariables/tryFinally9.kt b/compiler/testData/debug/localVariables/tryFinally9.kt
index ae6bf6fddb2..af1a8bb1e30 100644
--- a/compiler/testData/debug/localVariables/tryFinally9.kt
+++ b/compiler/testData/debug/localVariables/tryFinally9.kt
@@ -21,8 +21,11 @@ fun compute(): String {
             }
         }
     } finally {
-        val s2 = "OK"
-        x = s2  // TODO: Why is `s2` not visible here?
+        var s2 = "NOPE"
+        for (j in 0 until 1) {
+            s2 = "OK"
+        }
+        x = s2
     }
     return "FAIL"
 }
@@ -36,7 +39,7 @@ fun box() {
 // IGNORE_BACKEND: JVM
 
 // LOCAL VARIABLES
-// test.kt:31 box:
+// test.kt:34 box:
 // test.kt:10 compute:
 // test.kt:11 compute:
 // test.kt:12 compute:
@@ -48,7 +51,10 @@ fun box() {
 // test.kt:4 compute: s:java.lang.String="NOPE":java.lang.String, $i$f$f:int=0:int
 // test.kt:20 compute: s:java.lang.String="NOPE":java.lang.String, $i$f$f:int=0:int, $i$a$-f-TestKt$compute$1:int=0:int
 // test.kt:24 compute:
-// test.kt:25 compute:
-// test.kt:31 box:
-// test.kt:32 box: result:java.lang.String="NON_LOCAL_RETURN":java.lang.String
-// test.kt:33 box: result:java.lang.String="NON_LOCAL_RETURN":java.lang.String, localX:java.lang.String="OK":java.lang.String
+// test.kt:25 compute: s2:java.lang.String="NOPE":java.lang.String
+// test.kt:26 compute: s2:java.lang.String="NOPE":java.lang.String, j:int=0:int
+// test.kt:25 compute: s2:java.lang.String="OK":java.lang.String, j:int=0:int
+// test.kt:28 compute: s2:java.lang.String="OK":java.lang.String
+// test.kt:34 box:
+// test.kt:35 box: result:java.lang.String="NON_LOCAL_RETURN":java.lang.String
+// test.kt:36 box: result:java.lang.String="NON_LOCAL_RETURN":java.lang.String, localX:java.lang.String="OK":java.lang.String