diff --git a/compiler/testData/debug/localVariables/constructors/multipleConstructors.kt b/compiler/testData/debug/localVariables/constructors/multipleConstructors.kt index 889ffba2305..4e97abd7255 100644 --- a/compiler/testData/debug/localVariables/constructors/multipleConstructors.kt +++ b/compiler/testData/debug/localVariables/constructors/multipleConstructors.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // FILE: test.kt open class Base(i: Int) @@ -17,35 +15,35 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:15 box: -// test.kt:7 : p:int=3:int -// test.kt:6 : -// test.kt:4 : i:int=1:int -// test.kt:6 : -// test.kt:8 : p:int=3:int +// test.kt:13 box: +// test.kt:5 : p:int=3:int +// test.kt:4 : +// test.kt:2 : i:int=1:int +// test.kt:4 : +// test.kt:6 : p:int=3:int // EXPECTATIONS JVM_IR -// test.kt:9 : p:int=3:int, a:int=2:int +// test.kt:7 : p:int=3:int, a:int=2:int // EXPECTATIONS JVM JVM_IR +// test.kt:13 box: +// test.kt:14 box: +// test.kt:9 : p1:int=4:int, p2:int=5:int +// test.kt:4 : +// test.kt:2 : i:int=1:int +// test.kt:4 : +// test.kt:9 : p1:int=4:int, p2:int=5:int +// test.kt:14 box: // test.kt:15 box: -// test.kt:16 box: -// test.kt:11 : p1:int=4:int, p2:int=5:int -// test.kt:6 : -// test.kt:4 : i:int=1:int -// test.kt:6 : -// test.kt:11 : p1:int=4:int, p2:int=5:int -// test.kt:16 box: -// test.kt:17 box: // EXPECTATIONS JS_IR +// test.kt:13 box: +// test.kt:5 Derived_init_$Init$: p=3:number +// test.kt:4 : +// test.kt:2 : i=1:number +// test.kt:4 : +// test.kt:6 Derived_init_$Init$: p=3:number +// test.kt:14 box: +// test.kt:9 Derived_init_$Init$: p1=4:number, p2=5:number +// test.kt:4 : +// test.kt:2 : i=1:number +// test.kt:4 : // test.kt:15 box: -// test.kt:7 Derived_init_$Init$: p=3:number -// test.kt:6 : -// test.kt:4 : i=1:number -// test.kt:6 : -// test.kt:8 Derived_init_$Init$: p=3:number -// test.kt:16 box: -// test.kt:11 Derived_init_$Init$: p1=4:number, p2=5:number -// test.kt:6 : -// test.kt:4 : i=1:number -// test.kt:6 : -// test.kt:17 box: diff --git a/compiler/testData/debug/localVariables/constructors/property.kt b/compiler/testData/debug/localVariables/constructors/property.kt index 72b21eb8f6e..6b237ab3f4a 100644 --- a/compiler/testData/debug/localVariables/constructors/property.kt +++ b/compiler/testData/debug/localVariables/constructors/property.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // FILE: test.kt class F(val a: String) @@ -8,13 +6,13 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:7 box: -// test.kt:4 : a:java.lang.String="foo":java.lang.String -// test.kt:7 box: -// test.kt:8 box: +// test.kt:5 box: +// test.kt:2 : a:java.lang.String="foo":java.lang.String +// test.kt:5 box: +// test.kt:6 box: // EXPECTATIONS JS_IR -// test.kt:7 box: -// test.kt:4 : a="foo":kotlin.String -// test.kt:4 : a="foo":kotlin.String -// test.kt:8 box: +// test.kt:5 box: +// test.kt:2 : a="foo":kotlin.String +// test.kt:2 : a="foo":kotlin.String +// test.kt:6 box: diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt b/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt index c520a3d3cd5..906769f5212 100644 --- a/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt +++ b/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // FILE: test.kt class MyPair(val x: String, val y: String) { operator fun component1(): String { @@ -18,28 +16,28 @@ fun box(): String { } // EXPECTATIONS JVM JVM_IR -// test.kt:15 box: -// test.kt:4 : 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: +// test.kt:13 box: +// test.kt:2 : x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String +// test.kt:13 box: +// test.kt:14 box: p:MyPair=MyPair +// test.kt:4 component1: +// test.kt:14 box: p:MyPair=MyPair +// test.kt:8 component2: // EXPECTATIONS JVM -// test.kt:16 box: p:MyPair=MyPair +// test.kt:14 box: p:MyPair=MyPair // EXPECTATIONS JVM_IR -// test.kt:16 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String +// test.kt:14 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String // EXPECTATIONS JVM JVM_IR -// test.kt:17 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String +// test.kt:15 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String // EXPECTATIONS JS_IR -// test.kt:15 box: -// test.kt:4 : x="X":kotlin.String, y="Y":kotlin.String -// test.kt:4 : x="X":kotlin.String, y="Y":kotlin.String -// test.kt:4 : x="X":kotlin.String, y="Y":kotlin.String -// test.kt:16 box: p=MyPair -// test.kt:16 box: p=MyPair -// test.kt:6 component1: -// test.kt:16 box: p=MyPair, o="O":kotlin.String -// test.kt:10 component2: -// test.kt:17 box: p=MyPair, o="O":kotlin.String, k="K":kotlin.String +// test.kt:13 box: +// test.kt:2 : x="X":kotlin.String, y="Y":kotlin.String +// test.kt:2 : x="X":kotlin.String, y="Y":kotlin.String +// test.kt:2 : x="X":kotlin.String, y="Y":kotlin.String +// test.kt:14 box: p=MyPair +// test.kt:14 box: p=MyPair +// test.kt:4 component1: +// test.kt:14 box: p=MyPair, o="O":kotlin.String +// test.kt:8 component2: +// test.kt:15 box: p=MyPair, o="O":kotlin.String, k="K":kotlin.String diff --git a/compiler/testData/debug/localVariables/inlineProperty.kt b/compiler/testData/debug/localVariables/inlineProperty.kt index 9c6195f5678..a4b7d03c317 100644 --- a/compiler/testData/debug/localVariables/inlineProperty.kt +++ b/compiler/testData/debug/localVariables/inlineProperty.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // FILE: test.kt class A { inline val s: Int @@ -13,20 +11,20 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:10 box: -// test.kt:4 : -// test.kt:10 box: -// test.kt:11 box: a:A=A -// test.kt:6 box: a:A=A, this_$iv:A=A, $i$f$getS:int=0:int -// test.kt:11 box: a:A=A -// test.kt:12 box: a:A=A, y:int=1:int -// test.kt:13 box: a:A=A, y:int=2:int +// test.kt:8 box: +// test.kt:2 : +// test.kt:8 box: +// test.kt:9 box: a:A=A +// test.kt:4 box: a:A=A, this_$iv:A=A, $i$f$getS:int=0:int +// test.kt:9 box: a:A=A +// test.kt:10 box: a:A=A, y:int=1:int +// test.kt:11 box: a:A=A, y:int=2:int // EXPECTATIONS JS_IR -// test.kt:10 box: -// test.kt:4 : -// test.kt:6 box: a=A -// test.kt:11 box: a=A -// test.kt:12 box: a=A, y=1:number -// test.kt:12 box: a=A, y=1:number -// test.kt:13 box: a=A, y=2:number +// test.kt:8 box: +// test.kt:2 : +// test.kt:4 box: a=A +// test.kt:9 box: a=A +// test.kt:10 box: a=A, y=1:number +// test.kt:10 box: a=A, y=1:number +// test.kt:11 box: a=A, y=2:number diff --git a/compiler/testData/debug/localVariables/jvmOverloads.kt b/compiler/testData/debug/localVariables/jvmOverloads.kt index 1c4fc64bb88..cfe0dc53ea8 100644 --- a/compiler/testData/debug/localVariables/jvmOverloads.kt +++ b/compiler/testData/debug/localVariables/jvmOverloads.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // TARGET_BACKEND: JVM // WITH_STDLIB // FILE: test.kt @@ -13,8 +11,8 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:12 box: -// test.kt:6 : -// test.kt:12 box: -// test.kt:8 foo: firstParam:int=4:int, secondParam:java.lang.String="":java.lang.String -// test.kt:13 box: +// test.kt:10 box: +// test.kt:4 : +// test.kt:10 box: +// test.kt:6 foo: firstParam:int=4:int, secondParam:java.lang.String="":java.lang.String +// test.kt:11 box: diff --git a/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt b/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt index 09cb67a4f48..69eb2e6f868 100644 --- a/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt +++ b/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // FILE: test.kt class Foo { inner class Bar { @@ -12,18 +10,18 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:10 box: -// test.kt:4 : -// test.kt:10 box: -// test.kt:11 box: x:Foo=Foo -// test.kt:5 : -// test.kt:11 box: x:Foo=Foo -// test.kt:12 box: x:Foo=Foo +// test.kt:8 box: +// test.kt:2 : +// test.kt:8 box: +// test.kt:9 box: x:Foo=Foo +// test.kt:3 : +// test.kt:9 box: x:Foo=Foo +// test.kt:10 box: x:Foo=Foo // EXPECTATIONS JS_IR -// test.kt:10 box: -// test.kt:4 : -// test.kt:11 box: x=Foo -// test.kt:5 : -// test.kt:5 : -// test.kt:12 box: x=Foo +// test.kt:8 box: +// test.kt:2 : +// test.kt:9 box: x=Foo +// test.kt:3 : +// test.kt:3 : +// test.kt:10 box: x=Foo diff --git a/compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt b/compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt index edb177bf66a..e11ddb0cc5f 100644 --- a/compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt +++ b/compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // Code generation problem with JVM backend. // IGNORE_BACKEND: JVM // FILE: test.kt @@ -12,15 +10,15 @@ suspend fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:11 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:6 : -// test.kt:11 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:7 foo: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:11 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:12 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:9 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:4 : +// test.kt:9 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:5 foo: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:9 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:10 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 // EXPECTATIONS JS_IR -// test.kt:11 box: $completion=EmptyContinuation -// test.kt:6 : -// test.kt:11 box: $completion=EmptyContinuation -// test.kt:7 foo: $completion=EmptyContinuation +// test.kt:9 box: $completion=EmptyContinuation +// test.kt:4 : +// test.kt:9 box: $completion=EmptyContinuation +// test.kt:5 foo: $completion=EmptyContinuation diff --git a/compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt b/compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt index ad8ab3b8583..dad0c88650d 100644 --- a/compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt +++ b/compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // Code generation problem with JVM backend. // IGNORE_BACKEND: JVM // FILE: test.kt @@ -17,29 +15,29 @@ suspend fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:16 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:6 : -// test.kt:16 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:8 foo1: -// test.kt:9 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long -// test.kt:7 foo: $completion:kotlin.coroutines.Continuation=A$foo1$1 +// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:4 : +// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:6 foo1: +// test.kt:7 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long +// test.kt:5 foo: $completion:kotlin.coroutines.Continuation=A$foo1$1 +// test.kt:7 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long +// test.kt:8 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long +// test.kt:5 foo: $completion:kotlin.coroutines.Continuation=A$foo1$1 +// test.kt:8 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long // test.kt:9 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long // test.kt:10 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long -// test.kt:7 foo: $completion:kotlin.coroutines.Continuation=A$foo1$1 -// test.kt:10 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long -// test.kt:11 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long -// test.kt:12 foo1: $continuation:kotlin.coroutines.Continuation=A$foo1$1, $result:java.lang.Object=null, l:long=42:long -// test.kt:16 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:17 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:15 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 // EXPECTATIONS JS_IR -// test.kt:16 box: $completion=EmptyContinuation -// test.kt:6 : -// test.kt:16 box: $completion=EmptyContinuation -// test.kt:16 box: $completion=EmptyContinuation +// test.kt:14 box: $completion=EmptyContinuation +// test.kt:4 : +// test.kt:14 box: $completion=EmptyContinuation +// test.kt:14 box: $completion=EmptyContinuation +// test.kt:7 doResume: +// test.kt:5 foo: $completion=$foo1COROUTINE$0 +// test.kt:8 doResume: +// test.kt:5 foo: $completion=$foo1COROUTINE$0 // test.kt:9 doResume: -// test.kt:7 foo: $completion=$foo1COROUTINE$0 -// test.kt:10 doResume: -// test.kt:7 foo: $completion=$foo1COROUTINE$0 -// test.kt:11 doResume: -// test.kt:12 doResume: dead=kotlin.Long +// test.kt:10 doResume: dead=kotlin.Long diff --git a/compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt b/compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt index 04d78dde765..1da33af3d7b 100644 --- a/compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt +++ b/compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // Code generation problem with JVM backend. // IGNORE_BACKEND: JVM // FILE: test.kt @@ -13,15 +11,15 @@ suspend fun box() { // EXPECTATIONS JVM JVM_IR -// test.kt:11 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:6 : -// test.kt:11 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:8 foo: $this$foo:A=A, $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:11 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:12 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:9 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:4 : +// test.kt:9 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:6 foo: $this$foo:A=A, $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:9 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:10 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 // EXPECTATIONS JS_IR -// test.kt:11 box: $completion=EmptyContinuation -// test.kt:6 : -// test.kt:11 box: $completion=EmptyContinuation -// test.kt:8 foo: =A, $completion=EmptyContinuation +// test.kt:9 box: $completion=EmptyContinuation +// test.kt:4 : +// test.kt:9 box: $completion=EmptyContinuation +// test.kt:6 foo: =A, $completion=EmptyContinuation diff --git a/compiler/testData/debug/localVariables/suspend/completion/staticStateMachineReceiver.kt b/compiler/testData/debug/localVariables/suspend/completion/staticStateMachineReceiver.kt index d1765c2fc8f..d3486ff40bd 100644 --- a/compiler/testData/debug/localVariables/suspend/completion/staticStateMachineReceiver.kt +++ b/compiler/testData/debug/localVariables/suspend/completion/staticStateMachineReceiver.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // Code generation problem with JVM backend. // IGNORE_BACKEND: JVM // FILE: test.kt @@ -19,29 +17,29 @@ suspend fun box() { // The lambda object constructor has a local variables table on the IR backend. // EXPECTATIONS JVM JVM_IR -// test.kt:16 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:6 : -// test.kt:16 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:9 foo1: -// test.kt:10 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, $this$foo1:A=A, l:long=42:long -// test.kt:8 foo: $this$foo:A=A, $completion:kotlin.coroutines.Continuation=TestKt$foo1$1 -// test.kt:10 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, $this$foo1:A=A, l:long=42:long -// test.kt:11 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, l:long=42:long, $this$foo1:A=A -// test.kt:8 foo: $this$foo:A=A, $completion:kotlin.coroutines.Continuation=TestKt$foo1$1 +// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:4 : +// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:7 foo1: +// test.kt:8 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, $this$foo1:A=A, l:long=42:long +// test.kt:6 foo: $this$foo:A=A, $completion:kotlin.coroutines.Continuation=TestKt$foo1$1 +// test.kt:8 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, $this$foo1:A=A, l:long=42:long +// test.kt:9 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, l:long=42:long, $this$foo1:A=A +// test.kt:6 foo: $this$foo:A=A, $completion:kotlin.coroutines.Continuation=TestKt$foo1$1 +// test.kt:9 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, l:long=42:long +// test.kt:10 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, l:long=42:long // test.kt:11 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, l:long=42:long -// test.kt:12 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, l:long=42:long -// test.kt:13 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, l:long=42:long -// test.kt:16 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:17 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:15 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 // EXPECTATIONS JS_IR -// test.kt:16 box: $completion=EmptyContinuation -// test.kt:6 : -// test.kt:16 box: $completion=EmptyContinuation -// test.kt:16 box: $completion=EmptyContinuation +// test.kt:14 box: $completion=EmptyContinuation +// test.kt:4 : +// test.kt:14 box: $completion=EmptyContinuation +// test.kt:14 box: $completion=EmptyContinuation +// test.kt:8 doResume: +// test.kt:6 foo: =A, $completion=$foo1COROUTINE$0 +// test.kt:9 doResume: +// test.kt:6 foo: =A, $completion=$foo1COROUTINE$0 // test.kt:10 doResume: -// test.kt:8 foo: =A, $completion=$foo1COROUTINE$0 -// test.kt:11 doResume: -// test.kt:8 foo: =A, $completion=$foo1COROUTINE$0 -// test.kt:12 doResume: -// test.kt:13 doResume: dead=kotlin.Long +// test.kt:11 doResume: dead=kotlin.Long diff --git a/compiler/testData/debug/localVariables/suspend/underscoreNames.kt b/compiler/testData/debug/localVariables/suspend/underscoreNames.kt index 6cd38122a26..e2c19d86a36 100644 --- a/compiler/testData/debug/localVariables/suspend/underscoreNames.kt +++ b/compiler/testData/debug/localVariables/suspend/underscoreNames.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // WITH_STDLIB // FILE: test.kt @@ -16,40 +14,40 @@ suspend fun box() = foo(A()) { (x_param, _, y_param) -> } // EXPECTATIONS JVM JVM_IR -// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:6 : -// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:12 foo: a:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$2, $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:7 component1: +// test.kt:12 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:4 : +// test.kt:12 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:10 foo: a:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$2, $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:5 component1: // EXPECTATIONS JVM -// test.kt:14 invokeSuspend: $result:java.lang.Object=kotlin.Unit, $dstr$x_param$_u24__u24$y_param:A=A +// test.kt:12 invokeSuspend: $result:java.lang.Object=kotlin.Unit, $dstr$x_param$_u24__u24$y_param:A=A // EXPECTATIONS JVM_IR -// test.kt:14 invokeSuspend: $result:java.lang.Object=kotlin.Unit +// test.kt:12 invokeSuspend: $result:java.lang.Object=kotlin.Unit // EXPECTATIONS JVM JVM_IR -// test.kt:9 component3: +// test.kt:7 component3: // EXPECTATIONS JVM_IR -// test.kt:14 invokeSuspend: $result:java.lang.Object=kotlin.Unit, x_param:java.lang.String="O":java.lang.String -// test.kt:15 invokeSuspend: $result:java.lang.Object=kotlin.Unit, x_param:java.lang.String="O":java.lang.String, y_param:java.lang.String="K":java.lang.String +// test.kt:12 invokeSuspend: $result:java.lang.Object=kotlin.Unit, x_param:java.lang.String="O":java.lang.String +// test.kt:13 invokeSuspend: $result:java.lang.Object=kotlin.Unit, x_param:java.lang.String="O":java.lang.String, y_param:java.lang.String="K":java.lang.String // EXPECTATIONS JVM -// test.kt:14 invokeSuspend: $result:java.lang.Object=kotlin.Unit, $dstr$x_param$_u24__u24$y_param:A=A -// test.kt:15 invokeSuspend: $result:java.lang.Object=kotlin.Unit, $dstr$x_param$_u24__u24$y_param:A=A, x_param:java.lang.String="O":java.lang.String, y_param:java.lang.String="K":java.lang.String +// test.kt:12 invokeSuspend: $result:java.lang.Object=kotlin.Unit, $dstr$x_param$_u24__u24$y_param:A=A +// test.kt:13 invokeSuspend: $result:java.lang.Object=kotlin.Unit, $dstr$x_param$_u24__u24$y_param:A=A, x_param:java.lang.String="O":java.lang.String, y_param:java.lang.String="K":java.lang.String // EXPECTATIONS JVM_IR // test.kt:-1 invoke: p1:A=A, p2:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 // EXPECTATIONS JVM // test.kt:-1 invoke: // EXPECTATIONS JVM JVM_IR -// test.kt:12 foo: a:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$2, $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:16 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:10 foo: a:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$2, $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// test.kt:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 // EXPECTATIONS JS_IR -// test.kt:14 box: $completion=EmptyContinuation -// test.kt:6 : -// test.kt:14 box: $completion=EmptyContinuation -// test.kt:14 box$slambda: -// test.kt:14 box: $completion=EmptyContinuation -// test.kt:12 foo: a=A, block=Function2, $completion=EmptyContinuation -// test.kt:14 doResume: -// test.kt:7 component1: -// test.kt:14 doResume: x_param="O":kotlin.String -// test.kt:9 component3: -// test.kt:15 doResume: x_param="O":kotlin.String, y_param="K":kotlin.String +// test.kt:12 box: $completion=EmptyContinuation +// test.kt:4 : +// test.kt:12 box: $completion=EmptyContinuation +// test.kt:12 box$slambda: +// test.kt:12 box: $completion=EmptyContinuation +// test.kt:10 foo: a=A, block=Function2, $completion=EmptyContinuation +// test.kt:12 doResume: +// test.kt:5 component1: +// test.kt:12 doResume: x_param="O":kotlin.String +// test.kt:7 component3: +// test.kt:13 doResume: x_param="O":kotlin.String, y_param="K":kotlin.String diff --git a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt index 0f34959275b..1413e00473f 100644 --- a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt +++ b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // FILE: test.kt inline fun foo(stringMaker: () -> String = { "OK" }): String { return stringMaker() @@ -19,21 +17,21 @@ fun box(): String { } // EXPECTATIONS JVM JVM_IR +// test.kt:14 box +// test.kt:2 box +// test.kt:3 box +// test.kt:2 box +// test.kt:3 box +// test.kt:15 box +// test.kt:6 box +// test.kt:10 box +// test.kt:7 box +// test.kt:10 box // test.kt:16 box -// test.kt:4 box -// test.kt:5 box -// test.kt:4 box -// test.kt:5 box -// test.kt:17 box -// test.kt:8 box -// test.kt:12 box -// test.kt:9 box -// test.kt:12 box -// test.kt:18 box // EXPECTATIONS JS_IR -// test.kt:4 box -// test.kt:5 box -// test.kt:9 box -// test.kt:12 box -// test.kt:18 box +// test.kt:2 box +// test.kt:3 box +// test.kt:7 box +// test.kt:10 box +// test.kt:16 box diff --git a/compiler/testData/debug/stepping/whenIsChecks.kt b/compiler/testData/debug/stepping/whenIsChecks.kt index e70ce26674f..106453d39db 100644 --- a/compiler/testData/debug/stepping/whenIsChecks.kt +++ b/compiler/testData/debug/stepping/whenIsChecks.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // FILE: test.kt fun foo(x: Any) { @@ -20,36 +18,36 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:17 box +// test.kt:15 box +// test.kt:4 foo +// test.kt:5 foo // test.kt:6 foo +// test.kt:12 foo +// test.kt:16 box +// test.kt:4 foo +// test.kt:5 foo // test.kt:7 foo // test.kt:8 foo -// test.kt:14 foo -// test.kt:18 box -// test.kt:6 foo -// test.kt:7 foo -// test.kt:9 foo -// test.kt:10 foo -// test.kt:14 foo -// test.kt:19 box -// test.kt:6 foo -// test.kt:7 foo -// test.kt:9 foo // test.kt:12 foo -// test.kt:14 foo -// test.kt:20 box +// test.kt:17 box +// test.kt:4 foo +// test.kt:5 foo +// test.kt:7 foo +// test.kt:10 foo +// test.kt:12 foo +// test.kt:18 box // EXPECTATIONS JS_IR +// test.kt:15 box +// test.kt:4 foo +// test.kt:5 foo +// test.kt:12 foo +// test.kt:16 box +// test.kt:4 foo +// test.kt:5 foo +// test.kt:12 foo // test.kt:17 box -// test.kt:6 foo -// test.kt:7 foo -// test.kt:14 foo +// test.kt:4 foo +// test.kt:5 foo +// test.kt:12 foo // test.kt:18 box -// test.kt:6 foo -// test.kt:7 foo -// test.kt:14 foo -// test.kt:19 box -// test.kt:6 foo -// test.kt:7 foo -// test.kt:14 foo -// test.kt:20 box diff --git a/compiler/testData/debug/stepping/whenNullalbeSubject.kt b/compiler/testData/debug/stepping/whenNullalbeSubject.kt index e5d10f80225..b2912c641c4 100644 --- a/compiler/testData/debug/stepping/whenNullalbeSubject.kt +++ b/compiler/testData/debug/stepping/whenNullalbeSubject.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR -// Reason: KT-56755 // FILE: test.kt fun box() { @@ -18,15 +16,15 @@ fun box() { } // EXPECTATIONS JVM JVM_IR +// test.kt:4 box +// test.kt:5 box // test.kt:6 box -// test.kt:7 box -// test.kt:8 box -// test.kt:11 box -// test.kt:15 box -// test.kt:18 box +// test.kt:9 box +// test.kt:13 box +// test.kt:16 box // EXPECTATIONS JS_IR -// test.kt:6 box -// test.kt:7 box -// test.kt:7 box -// test.kt:18 box +// test.kt:4 box +// test.kt:5 box +// test.kt:5 box +// test.kt:16 box