[IR] More extensive LVT tests around destructuring

All tests in this commit _pass_ to document existing behavior, but
this will change in a separate commit as we reflect desired behavior
in the test expectations.

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLocalVariableTestGenerated.java

@@ -25,6 +25,12 @@ public class FirLocalVariableTestGenerated extends AbstractFirLocalVariableTest
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
     }
 
+    @Test
+    @TestMetadata("assignment.kt")
+    public void testAssignment() throws Exception {
+        runTest("compiler/testData/debug/localVariables/assignment.kt");
+    }
+
     @Test
     @TestMetadata("catchClause.kt")
     public void testCatchClause() throws Exception {
@@ -37,18 +43,6 @@ public class FirLocalVariableTestGenerated extends AbstractFirLocalVariableTest
         runTest("compiler/testData/debug/localVariables/copyFunction.kt");
     }
 
-    @Test
-    @TestMetadata("destructuringInFor.kt")
-    public void testDestructuringInFor() throws Exception {
-        runTest("compiler/testData/debug/localVariables/destructuringInFor.kt");
-    }
-
-    @Test
-    @TestMetadata("destructuringInLambdas.kt")
-    public void testDestructuringInLambdas() throws Exception {
-        runTest("compiler/testData/debug/localVariables/destructuringInLambdas.kt");
-    }
-
     @Test
     @TestMetadata("doWhile.kt")
     public void testDoWhile() throws Exception {
@@ -61,6 +55,12 @@ public class FirLocalVariableTestGenerated extends AbstractFirLocalVariableTest
         runTest("compiler/testData/debug/localVariables/emptyFun.kt");
     }
 
+    @Test
+    @TestMetadata("forLoopMultiline.kt")
+    public void testForLoopMultiline() throws Exception {
+        runTest("compiler/testData/debug/localVariables/forLoopMultiline.kt");
+    }
+
     @Test
     @TestMetadata("inlineProperty.kt")
     public void testInlineProperty() throws Exception {
@@ -215,6 +215,94 @@ public class FirLocalVariableTestGenerated extends AbstractFirLocalVariableTest
         }
     }
 
+    @Nested
+    @TestMetadata("compiler/testData/debug/localVariables/destructuring")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Destructuring {
+        @Test
+        public void testAllFilesPresentInDestructuring() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables/destructuring"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @Test
+        @TestMetadata("assignment.kt")
+        public void testAssignment() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignment.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentCustomComponentNs.kt")
+        public void testAssignmentCustomComponentNs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentCustomComponentNsMultiline.kt")
+        public void testAssignmentCustomComponentNsMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentMultiline.kt")
+        public void testAssignmentMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentUnderscoreNames.kt")
+        public void testAssignmentUnderscoreNames() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNames.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentUnderscoreNamesMultiline.kt")
+        public void testAssignmentUnderscoreNamesMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("forLoop.kt")
+        public void testForLoop() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/forLoop.kt");
+        }
+
+        @Test
+        @TestMetadata("forLoopMultiline.kt")
+        public void testForLoopMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambda.kt")
+        public void testLambda() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambda.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaCustomComponentNs.kt")
+        public void testLambdaCustomComponentNs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaCustomComponentNsMultiline.kt")
+        public void testLambdaCustomComponentNsMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNsMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaMultiline.kt")
+        public void testLambdaMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaMultipleDestructs.kt")
+        public void testLambdaMultipleDestructs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("compiler/testData/debug/localVariables/receiverMangling")
     @TestDataPath("$PROJECT_ROOT")

compiler/testData/debug/localVariables/assignment.kt

@@ -0,0 +1,32 @@
+
+
+// FILE: test.kt
+fun box(): String {
+    val
+            o
+            =
+        "O"
+
+
+    val k = "K"
+
+    return o + k
+}
+
+// A location for the expression being evaluated, and one for the store to the LV, but:
+//    JVM: location for evaluating expression, location for the assigned variable
+//    JVM_IR: location for evaluating expression, location for the val keyword
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:8 box:
+// test.kt:6 box:
+// test.kt:11 box: o:java.lang.String="O":java.lang.String
+// test.kt:13 box: o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String
+
+// EXPECTATIONS JVM_IR
+// test.kt:8 box:
+// test.kt:5 box:
+// test.kt:11 box: o:java.lang.String="O":java.lang.String
+// test.kt:13 box: o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String

compiler/testData/debug/localVariables/destructuring/assignment.kt

@@ -0,0 +1,18 @@
+// WITH_STDLIB
+
+// FILE: test.kt
+fun box(): String {
+    val p = "O" to "K"
+
+    val ( o , k ) = p
+
+    return o + k
+}
+
+// EXPECTATIONS
+
+// test.kt:5 box:
+// test.kt:7 box: p:kotlin.Pair=kotlin.Pair
+// test.kt:9 box: p:kotlin.Pair=kotlin.Pair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String
+
+

compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt

@@ -0,0 +1,36 @@
+
+
+// FILE: test.kt
+class MyPair(val x: String, val y: String) {
+    operator fun component1(): String {
+        return "O"
+    }
+
+    operator fun component2(): String {
+        return "K"
+    }
+}
+
+fun box(): String {
+    val p = MyPair("X", "Y")
+    val (o, k) = p
+    return o + k
+}
+
+// EXPECTATIONS
+// test.kt:15 box:
+// test.kt:4 <init>: x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String
+// test.kt:15 box:
+
+// test.kt:16 box: p:MyPair=MyPair
+// test.kt:6 component1:
+// test.kt:16 box: p:MyPair=MyPair
+// test.kt:10 component2:
+
+// EXPECTATIONS JVM
+// test.kt:16 box: p:MyPair=MyPair
+// test.kt:17 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String
+
+// EXPECTATIONS JVM_IR
+// test.kt:16 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String
+// test.kt:17 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String

compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt

@@ -0,0 +1,49 @@
+
+// IGNORE_BACKEND_FIR: JVM_IR
+// FILE: test.kt
+class MyPair(val x: String, val y: String) {
+    operator fun component1(): String {
+        return "O"
+    }
+
+    operator fun component2(): String {
+        return "K"
+    }
+}
+
+fun box(): String {
+    val p = MyPair("X", "Y")
+    val
+            (
+        o
+            ,
+        k
+    )
+            =
+        p
+    return o + k
+}
+
+// EXPECTATIONS
+// test.kt:15 box:
+// test.kt:4 <init>: x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String
+// test.kt:15 box:
+
+// EXPECTATIONS JVM
+// test.kt:23 box: p:MyPair=MyPair
+// test.kt:6 component1:
+// test.kt:18 box: p:MyPair=MyPair
+// test.kt:10 component2:
+// test.kt:20 box: p:MyPair=MyPair
+// test.kt:24 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String
+
+// EXPECTATIONS JVM_IR
+// test.kt:23 box: p:MyPair=MyPair
+// test.kt:18 box: p:MyPair=MyPair
+// test.kt:6 component1:
+// test.kt:18 box: p:MyPair=MyPair
+// test.kt:23 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String
+// test.kt:20 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String
+// test.kt:10 component2:
+// test.kt:20 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String
+// test.kt:24 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String

compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt

@@ -0,0 +1,34 @@
+// WITH_STDLIB
+
+// IGNORE_BACKEND_FIR: JVM_IR
+// FILE: test.kt
+fun box(): String {
+    val p = "O" to "K"
+
+    val
+            (
+        o
+            ,
+        k
+    )
+            =
+        p
+
+    return o + k
+}
+
+// EXPECTATIONS
+// test.kt:6 box:
+
+// EXPECTATIONS JVM
+// test.kt:15 box: p:kotlin.Pair=kotlin.Pair
+// test.kt:10 box: p:kotlin.Pair=kotlin.Pair
+// test.kt:12 box: p:kotlin.Pair=kotlin.Pair
+// test.kt:17 box: p:kotlin.Pair=kotlin.Pair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String
+
+// EXPECTATIONS JVM_IR
+// test.kt:15 box: p:kotlin.Pair=kotlin.Pair
+// test.kt:10 box: p:kotlin.Pair=kotlin.Pair
+// test.kt:15 box: p:kotlin.Pair=kotlin.Pair, o:java.lang.String="O":java.lang.String
+// test.kt:12 box: p:kotlin.Pair=kotlin.Pair, o:java.lang.String="O":java.lang.String
+// test.kt:17 box: p:kotlin.Pair=kotlin.Pair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String

compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNames.kt

@@ -0,0 +1,22 @@
+// WITH_STDLIB
+
+// FILE: test.kt
+fun box(): String {
+    val p = Triple("X","O","K")
+
+    val ( _ , o, k ) = p
+
+    return o + k
+}
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:5 box:
+// test.kt:7 box: p:kotlin.Triple=kotlin.Triple
+// test.kt:9 box: p:kotlin.Triple=kotlin.Triple, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String
+
+// EXPECTATIONS JVM_IR
+// test.kt:5 box:
+// test.kt:7 box: p:kotlin.Triple=kotlin.Triple
+// test.kt:9 box: p:kotlin.Triple=kotlin.Triple, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String

compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt

@@ -0,0 +1,41 @@
+// WITH_STDLIB
+
+// IGNORE_BACKEND_FIR: JVM_IR
+// FILE: test.kt
+fun box(): String {
+    val p = Triple("X","O","K")
+
+    val
+            (
+        _
+            ,
+        o
+            ,
+        k
+    )
+    =
+        p
+
+    return o + k
+}
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:6 box:
+
+// test.kt:17 box: p:kotlin.Triple=kotlin.Triple
+// test.kt:12 box: p:kotlin.Triple=kotlin.Triple
+// test.kt:14 box: p:kotlin.Triple=kotlin.Triple
+
+// test.kt:19 box: p:kotlin.Triple=kotlin.Triple, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String
+
+// EXPECTATIONS JVM_IR
+// test.kt:6 box:
+
+// test.kt:17 box: p:kotlin.Triple=kotlin.Triple
+// test.kt:12 box: p:kotlin.Triple=kotlin.Triple
+// test.kt:17 box: p:kotlin.Triple=kotlin.Triple, o:java.lang.String="O":java.lang.String
+// test.kt:14 box: p:kotlin.Triple=kotlin.Triple, o:java.lang.String="O":java.lang.String
+
+// test.kt:19 box: p:kotlin.Triple=kotlin.Triple, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String

compiler/testData/debug/localVariables/destructuring/forLoop.kt

@@ -1,6 +1,6 @@
 // WITH_STDLIB
 
-//FILE: test.kt
+// FILE: test.kt
 fun box() {
     val map: Map<String, String> = mapOf("1" to "23")
     for ((a, b) in map) {

compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt

@@ -0,0 +1,50 @@
+// WITH_STDLIB
+
+// IGNORE_BACKEND_FIR: JVM_IR
+// FILE: test.kt
+fun box() {
+    val map: Map<String, String> = mapOf("1" to "23")
+
+    for
+            (
+    (
+        a
+            ,
+        b
+    )
+    in
+    map
+    )
+    {
+        a + b
+    }
+}
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:6 box:
+// test.kt:16 box: map:java.util.Map=java.util.Collections$SingletonMap
+
+// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:11 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:13 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:19 box: map:java.util.Map=java.util.Collections$SingletonMap, a:java.lang.String="1":java.lang.String, b:java.lang.String="23":java.lang.String
+
+// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
+
+// test.kt:21 box: map:java.util.Map=java.util.Collections$SingletonMap
+
+// EXPECTATIONS JVM_IR
+// test.kt:6 box:
+// test.kt:16 box: map:java.util.Map=java.util.Collections$SingletonMap
+
+// test.kt:11 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:13 box: map:java.util.Map=java.util.Collections$SingletonMap, a:java.lang.String="1":java.lang.String
+// test.kt:16 box: map:java.util.Map=java.util.Collections$SingletonMap, a:java.lang.String="1":java.lang.String
+// test.kt:13 box: map:java.util.Map=java.util.Collections$SingletonMap, a:java.lang.String="1":java.lang.String
+
+// test.kt:19 box: map:java.util.Map=java.util.Collections$SingletonMap, a:java.lang.String="1":java.lang.String, b:java.lang.String="23":java.lang.String
+
+// test.kt:16 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:21 box: map:java.util.Map=java.util.Collections$SingletonMap

compiler/testData/debug/localVariables/destructuring/lambda.kt

@@ -0,0 +1,31 @@
+
+
+// FILE: test.kt
+data class A(val x: String, val y: Int)
+
+fun foo(a: A, block: (A) -> String): String = block(a)
+
+fun box() {
+    foo(A("O", 123)) { (x, y) -> x + y }
+}
+
+// EXPECTATIONS
+// EXPECTATIONS JVM
+// test.kt:9 box:
+// test.kt:4 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:9 box:
+// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 invoke: $dstr$x$y:A=A
+// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 box:
+// test.kt:10 box:
+
+// EXPECTATIONS JVM_IR
+// test.kt:9 box:
+// test.kt:4 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:9 box:
+// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 invoke:
+// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 box:
+// test.kt:10 box:

compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt

@@ -0,0 +1,48 @@
+
+
+// FILE: test.kt
+class MyPair(val x: String, val y: String) {
+    operator fun component1(): String {
+        return "O"
+    }
+
+    operator fun component2(): String {
+        return "K"
+    }
+}
+
+fun foo(a: MyPair, block: (MyPair) -> String): String = block(a)
+
+fun box() {
+    foo(MyPair("X", "Y")) { (x, y) -> x + y }
+}
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:17 box:
+// test.kt:4 <init>: x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String
+// test.kt:17 box:
+// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:17 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:6 component1:
+// test.kt:17 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:10 component2:
+// test.kt:17 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:17 box:
+// test.kt:18 box:
+
+// EXPECTATIONS JVM_IR
+// test.kt:17 box:
+// test.kt:4 <init>: x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String
+// test.kt:17 box:
+// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:17 invoke:
+// test.kt:6 component1:
+// test.kt:17 invoke:
+// test.kt:10 component2:
+// test.kt:17 invoke: x:java.lang.String="O":java.lang.String
+// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:17 box:
+// test.kt:18 box:

compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNsMultiline.kt

@@ -0,0 +1,62 @@
+// IGNORE_BACKEND_FIR: JVM_IR
+
+// FILE: test.kt
+class MyPair(val x: String, val y: String) {
+    operator fun component1(): String {
+        return "O"
+    }
+
+    operator fun component2(): String {
+        return "K"
+    }
+}
+
+fun foo(a: MyPair, block: (MyPair) -> String): String = block(a)
+
+fun box() {
+    foo(MyPair("X", "Y"))
+    {
+            (
+                x
+                    ,
+                y
+            )
+        ->
+        x + y
+    }
+}
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:17 box:
+// test.kt:4 <init>: x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String
+// test.kt:18 box:
+// test.kt:17 box:
+// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:25 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:6 component1:
+// test.kt:25 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:10 component2:
+// test.kt:25 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:17 box:
+// test.kt:27 box:
+
+// EXPECTATIONS JVM_IR
+// test.kt:17 box:
+// test.kt:4 <init>: x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String
+// test.kt:17 box:
+// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:19 invoke:
+// test.kt:20 invoke:
+// test.kt:6 component1:
+// test.kt:20 invoke:
+// test.kt:19 invoke: x:java.lang.String="O":java.lang.String
+// test.kt:22 invoke: x:java.lang.String="O":java.lang.String
+// test.kt:10 component2:
+// test.kt:22 invoke: x:java.lang.String="O":java.lang.String
+// test.kt:25 invoke: x:java.lang.String="O":java.lang.String, y:java.lang.String="K":java.lang.String
+// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:17 box:
+// test.kt:27 box:

compiler/testData/debug/localVariables/destructuring/lambdaMultiline.kt

@@ -0,0 +1,48 @@
+// IGNORE_BACKEND_FIR: JVM_IR
+
+// FILE: test.kt
+data class A(val x: String, val y: Int)
+
+fun foo(a: A, block: (A) -> String): String = block(a)
+
+fun box() {
+    foo(A("O", 123))
+    {
+            (
+                x
+                    ,
+                y
+            )
+        ->
+        x + y
+    }
+
+    return
+}
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:9 box:
+// test.kt:4 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:10 box:
+// test.kt:9 box:
+// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:17 invoke: $dstr$x$y:A=A
+// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 box:
+// test.kt:20 box:
+
+// EXPECTATIONS JVM_IR
+// test.kt:9 box:
+// test.kt:4 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:9 box:
+// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:11 invoke:
+// test.kt:12 invoke:
+// test.kt:11 invoke: x:java.lang.String="O":java.lang.String
+// test.kt:14 invoke: x:java.lang.String="O":java.lang.String
+// test.kt:17 invoke: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:9 box:
+// test.kt:20 box:

compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt

@@ -0,0 +1,36 @@
+
+
+// FILE: test.kt
+data class A(val x: String, val y: Int)
+
+fun foo(a: A, b: A, block: (A, A) -> String): String = block(a, b)
+
+fun box() {
+    foo(A("O", 123), A("K", 877)) { (x, y), (z, w) -> (x + z) + (y + w) }
+}
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:9 box:
+// test.kt:4 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:9 box:
+// test.kt:4 <init>: x:java.lang.String="K":java.lang.String, y:int=877:int
+// test.kt:9 box:
+// test.kt:6 foo: a:A=A, b:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$1
+// test.kt:9 invoke: $dstr$x$y:A=A, $dstr$z$w:A=A
+// test.kt:6 foo: a:A=A, b:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$1
+// test.kt:9 box:
+// test.kt:10 box:
+
+// EXPECTATIONS JVM_IR
+// test.kt:9 box:
+// test.kt:4 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:9 box:
+// test.kt:4 <init>: x:java.lang.String="K":java.lang.String, y:int=877:int
+// test.kt:9 box:
+// test.kt:6 foo: a:A=A, b:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$1
+// test.kt:9 invoke:
+// test.kt:6 foo: a:A=A, b:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$1
+// test.kt:9 box:
+// test.kt:10 box:

compiler/testData/debug/localVariables/destructuringInLambdas.kt

@@ -1,25 +0,0 @@
-//FILE: test.kt
-
-data class A(val x: String, val y: Int)
-
-fun foo(a: A, block: (A) -> String): String = block(a)
-
-fun box() {
-    foo(A("O", 123)) { (x, y) -> x + y }
-}
-
-// EXPECTATIONS
-// test.kt:8 box:
-// test.kt:3 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
-// test.kt:8 box:
-// test.kt:5 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
-
-// EXPECTATIONS JVM
-// test.kt:8 invoke: $dstr$x$y:A=A
-// EXPECTATIONS JVM_IR
-// test.kt:8 invoke:
-
-// EXPECTATIONS
-// test.kt:5 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
-// test.kt:8 box:
-// test.kt:9 box:

compiler/testData/debug/localVariables/forLoopMultiline.kt

@@ -0,0 +1,35 @@
+// WITH_STDLIB
+
+// IGNORE_BACKEND_FIR: JVM_IR
+// FILE: test.kt
+fun box() {
+    val map: Map<String, String> = mapOf("1" to "23")
+
+    for
+            (
+    e
+    in
+    map
+    )
+    {
+        e.key + e.value
+    }
+}
+
+// EXPECTATIONS
+
+// EXPECTATIONS JVM
+// test.kt:6 box:
+// test.kt:12 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:15 box: map:java.util.Map=java.util.Collections$SingletonMap, e:java.util.Map$Entry=java.util.AbstractMap$SimpleImmutableEntry
+// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:17 box: map:java.util.Map=java.util.Collections$SingletonMap
+
+// EXPECTATIONS JVM_IR
+// test.kt:6 box:
+// test.kt:12 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:10 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:15 box: map:java.util.Map=java.util.Collections$SingletonMap, e:java.util.Map$Entry=java.util.AbstractMap$SimpleImmutableEntry
+// test.kt:12 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:17 box: map:java.util.Map=java.util.Collections$SingletonMap

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrLocalVariableTestGenerated.java

@@ -25,6 +25,12 @@ public class IrLocalVariableTestGenerated extends AbstractIrLocalVariableTest {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
     }
 
+    @Test
+    @TestMetadata("assignment.kt")
+    public void testAssignment() throws Exception {
+        runTest("compiler/testData/debug/localVariables/assignment.kt");
+    }
+
     @Test
     @TestMetadata("catchClause.kt")
     public void testCatchClause() throws Exception {
@@ -37,18 +43,6 @@ public class IrLocalVariableTestGenerated extends AbstractIrLocalVariableTest {
         runTest("compiler/testData/debug/localVariables/copyFunction.kt");
     }
 
-    @Test
-    @TestMetadata("destructuringInFor.kt")
-    public void testDestructuringInFor() throws Exception {
-        runTest("compiler/testData/debug/localVariables/destructuringInFor.kt");
-    }
-
-    @Test
-    @TestMetadata("destructuringInLambdas.kt")
-    public void testDestructuringInLambdas() throws Exception {
-        runTest("compiler/testData/debug/localVariables/destructuringInLambdas.kt");
-    }
-
     @Test
     @TestMetadata("doWhile.kt")
     public void testDoWhile() throws Exception {
@@ -61,6 +55,12 @@ public class IrLocalVariableTestGenerated extends AbstractIrLocalVariableTest {
         runTest("compiler/testData/debug/localVariables/emptyFun.kt");
     }
 
+    @Test
+    @TestMetadata("forLoopMultiline.kt")
+    public void testForLoopMultiline() throws Exception {
+        runTest("compiler/testData/debug/localVariables/forLoopMultiline.kt");
+    }
+
     @Test
     @TestMetadata("inlineProperty.kt")
     public void testInlineProperty() throws Exception {
@@ -215,6 +215,94 @@ public class IrLocalVariableTestGenerated extends AbstractIrLocalVariableTest {
         }
     }
 
+    @Nested
+    @TestMetadata("compiler/testData/debug/localVariables/destructuring")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Destructuring {
+        @Test
+        public void testAllFilesPresentInDestructuring() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables/destructuring"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        }
+
+        @Test
+        @TestMetadata("assignment.kt")
+        public void testAssignment() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignment.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentCustomComponentNs.kt")
+        public void testAssignmentCustomComponentNs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentCustomComponentNsMultiline.kt")
+        public void testAssignmentCustomComponentNsMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentMultiline.kt")
+        public void testAssignmentMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentUnderscoreNames.kt")
+        public void testAssignmentUnderscoreNames() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNames.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentUnderscoreNamesMultiline.kt")
+        public void testAssignmentUnderscoreNamesMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("forLoop.kt")
+        public void testForLoop() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/forLoop.kt");
+        }
+
+        @Test
+        @TestMetadata("forLoopMultiline.kt")
+        public void testForLoopMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambda.kt")
+        public void testLambda() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambda.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaCustomComponentNs.kt")
+        public void testLambdaCustomComponentNs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaCustomComponentNsMultiline.kt")
+        public void testLambdaCustomComponentNsMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNsMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaMultiline.kt")
+        public void testLambdaMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaMultipleDestructs.kt")
+        public void testLambdaMultipleDestructs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("compiler/testData/debug/localVariables/receiverMangling")
     @TestDataPath("$PROJECT_ROOT")

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/LocalVariableTestGenerated.java

@@ -25,6 +25,12 @@ public class LocalVariableTestGenerated extends AbstractLocalVariableTest {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
     }
 
+    @Test
+    @TestMetadata("assignment.kt")
+    public void testAssignment() throws Exception {
+        runTest("compiler/testData/debug/localVariables/assignment.kt");
+    }
+
     @Test
     @TestMetadata("catchClause.kt")
     public void testCatchClause() throws Exception {
@@ -37,18 +43,6 @@ public class LocalVariableTestGenerated extends AbstractLocalVariableTest {
         runTest("compiler/testData/debug/localVariables/copyFunction.kt");
     }
 
-    @Test
-    @TestMetadata("destructuringInFor.kt")
-    public void testDestructuringInFor() throws Exception {
-        runTest("compiler/testData/debug/localVariables/destructuringInFor.kt");
-    }
-
-    @Test
-    @TestMetadata("destructuringInLambdas.kt")
-    public void testDestructuringInLambdas() throws Exception {
-        runTest("compiler/testData/debug/localVariables/destructuringInLambdas.kt");
-    }
-
     @Test
     @TestMetadata("doWhile.kt")
     public void testDoWhile() throws Exception {
@@ -61,6 +55,12 @@ public class LocalVariableTestGenerated extends AbstractLocalVariableTest {
         runTest("compiler/testData/debug/localVariables/emptyFun.kt");
     }
 
+    @Test
+    @TestMetadata("forLoopMultiline.kt")
+    public void testForLoopMultiline() throws Exception {
+        runTest("compiler/testData/debug/localVariables/forLoopMultiline.kt");
+    }
+
     @Test
     @TestMetadata("inlineProperty.kt")
     public void testInlineProperty() throws Exception {
@@ -215,6 +215,94 @@ public class LocalVariableTestGenerated extends AbstractLocalVariableTest {
         }
     }
 
+    @Nested
+    @TestMetadata("compiler/testData/debug/localVariables/destructuring")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Destructuring {
+        @Test
+        public void testAllFilesPresentInDestructuring() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables/destructuring"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+        }
+
+        @Test
+        @TestMetadata("assignment.kt")
+        public void testAssignment() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignment.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentCustomComponentNs.kt")
+        public void testAssignmentCustomComponentNs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentCustomComponentNsMultiline.kt")
+        public void testAssignmentCustomComponentNsMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentMultiline.kt")
+        public void testAssignmentMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentUnderscoreNames.kt")
+        public void testAssignmentUnderscoreNames() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNames.kt");
+        }
+
+        @Test
+        @TestMetadata("assignmentUnderscoreNamesMultiline.kt")
+        public void testAssignmentUnderscoreNamesMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("forLoop.kt")
+        public void testForLoop() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/forLoop.kt");
+        }
+
+        @Test
+        @TestMetadata("forLoopMultiline.kt")
+        public void testForLoopMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambda.kt")
+        public void testLambda() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambda.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaCustomComponentNs.kt")
+        public void testLambdaCustomComponentNs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaCustomComponentNsMultiline.kt")
+        public void testLambdaCustomComponentNsMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNsMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaMultiline.kt")
+        public void testLambdaMultiline() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaMultiline.kt");
+        }
+
+        @Test
+        @TestMetadata("lambdaMultipleDestructs.kt")
+        public void testLambdaMultipleDestructs() throws Exception {
+            runTest("compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("compiler/testData/debug/localVariables/receiverMangling")
     @TestDataPath("$PROJECT_ROOT")