From 28b83a1a5d67d1f656eeaefadb3e2fb4d132826a Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 17 Feb 2023 13:00:22 +0200 Subject: [PATCH] [Test] Mute tests due to KT-56755 --- .../debug/localVariables/catchClause.kt | 30 +-- .../constructors/multipleConstructors.kt | 4 +- .../localVariables/constructors/property.kt | 4 +- .../assignmentCustomComponentNs.kt | 4 +- .../debug/localVariables/inlineProperty.kt | 32 +-- .../debug/localVariables/jvmOverloads.kt | 12 +- .../receiverMangling/capturedThisField.kt | 4 +- .../labeledThisParameterLabel.kt | 4 +- .../simpleCapturedReceiver.kt | 4 +- .../simpleCapturedReceiverWithLabel.kt | 4 +- .../simpleCapturedReceiverWithParenthesis.kt | 4 +- .../suspend/completion/nonStaticSimple.kt | 22 ++- .../completion/nonStaticStateMachine.kt | 44 +++-- .../completion/staticSimpleReceiver.kt | 22 ++- .../completion/staticStateMachineReceiver.kt | 46 ++--- .../localVariables/suspend/underscoreNames.kt | 52 ++--- .../debug/localVariables/tryFinally11.kt | 44 +++-- .../debug/localVariables/tryFinally12.kt | 44 +++-- .../debug/localVariables/tryFinally13.kt | 40 ++-- .../debug/localVariables/tryFinally7.kt | 60 +++--- .../debug/localVariables/tryFinally8.kt | 64 +++--- .../stepping/lambdaStepInlineWithDefaults.kt | 29 +-- .../testData/debug/stepping/throwException.kt | 30 +-- compiler/testData/debug/stepping/tryCatch.kt | 40 ++-- .../debug/stepping/tryCatchExpression.kt | 182 +++++++++--------- .../debug/stepping/tryCatchFinally.kt | 145 +++++++------- .../testData/debug/stepping/whenIsChecks.kt | 54 +++--- .../debug/stepping/whenNullalbeSubject.kt | 20 +- .../kotlin/test/utils/SteppingTestUtils.kt | 3 + 29 files changed, 544 insertions(+), 503 deletions(-) diff --git a/compiler/testData/debug/localVariables/catchClause.kt b/compiler/testData/debug/localVariables/catchClause.kt index 4e91ae77141..c82dd2dc6cb 100644 --- a/compiler/testData/debug/localVariables/catchClause.kt +++ b/compiler/testData/debug/localVariables/catchClause.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun box() { try { @@ -11,20 +13,20 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:3 box: -// test.kt:4 box: -// test.kt:5 box: a:int=1:int -// test.kt:6 box: a:int=0:int -// test.kt:8 box: -// test.kt:9 box: e:java.lang.Throwable=java.lang.ArithmeticException -// test.kt:11 box: +// test.kt:5 box: +// test.kt:6 box: +// test.kt:7 box: a:int=1:int +// test.kt:8 box: a:int=0:int +// test.kt:10 box: +// test.kt:11 box: e:java.lang.Throwable=java.lang.ArithmeticException +// test.kt:13 box: // EXPECTATIONS JS_IR -// test.kt:4 box: -// test.kt:5 box: a=1:number -// test.kt:5 box: a=1:number -// test.kt:6 box: a=0:number -// test.kt:7 box: a=0:number +// test.kt:6 box: +// test.kt:7 box: a=1:number +// test.kt:7 box: a=1:number // test.kt:8 box: a=0:number -// test.kt:8 box: a=0:number -// test.kt:9 box: a=0:number, e=kotlin.ArithmeticException +// test.kt:9 box: a=0:number +// test.kt:10 box: a=0:number +// test.kt:10 box: a=0:number +// test.kt:11 box: a=0:number, e=kotlin.ArithmeticException diff --git a/compiler/testData/debug/localVariables/constructors/multipleConstructors.kt b/compiler/testData/debug/localVariables/constructors/multipleConstructors.kt index 5d06ba75956..889ffba2305 100644 --- a/compiler/testData/debug/localVariables/constructors/multipleConstructors.kt +++ b/compiler/testData/debug/localVariables/constructors/multipleConstructors.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt open class Base(i: Int) diff --git a/compiler/testData/debug/localVariables/constructors/property.kt b/compiler/testData/debug/localVariables/constructors/property.kt index 369c72a51dd..72b21eb8f6e 100644 --- a/compiler/testData/debug/localVariables/constructors/property.kt +++ b/compiler/testData/debug/localVariables/constructors/property.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt class F(val a: String) diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt b/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt index ebb0ccb9e98..c520a3d3cd5 100644 --- a/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt +++ b/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNs.kt @@ -1,5 +1,5 @@ - - +// 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 { diff --git a/compiler/testData/debug/localVariables/inlineProperty.kt b/compiler/testData/debug/localVariables/inlineProperty.kt index a4b7d03c317..9c6195f5678 100644 --- a/compiler/testData/debug/localVariables/inlineProperty.kt +++ b/compiler/testData/debug/localVariables/inlineProperty.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt class A { inline val s: Int @@ -11,20 +13,20 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// 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 +// 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 // EXPECTATIONS JS_IR -// 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 +// 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 diff --git a/compiler/testData/debug/localVariables/jvmOverloads.kt b/compiler/testData/debug/localVariables/jvmOverloads.kt index cfe0dc53ea8..1c4fc64bb88 100644 --- a/compiler/testData/debug/localVariables/jvmOverloads.kt +++ b/compiler/testData/debug/localVariables/jvmOverloads.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // TARGET_BACKEND: JVM // WITH_STDLIB // FILE: test.kt @@ -11,8 +13,8 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// 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: +// 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: diff --git a/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt b/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt index 58c0786c4e3..09cb67a4f48 100644 --- a/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt +++ b/compiler/testData/debug/localVariables/receiverMangling/capturedThisField.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt class Foo { inner class Bar { diff --git a/compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt b/compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt index 2959aa158d4..11e7a6ed067 100644 --- a/compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt +++ b/compiler/testData/debug/localVariables/receiverMangling/labeledThisParameterLabel.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun blockFun(blockArg: String.() -> Unit) = "OK".blockArg() diff --git a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt index 2959aa158d4..11e7a6ed067 100644 --- a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt +++ b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiver.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun blockFun(blockArg: String.() -> Unit) = "OK".blockArg() diff --git a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt index feb6d28072e..7446fa41231 100644 --- a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt +++ b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithLabel.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun blockFun(blockArg: String.() -> Unit) = "OK".blockArg() diff --git a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt index 78b6db52518..901ef63654e 100644 --- a/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt +++ b/compiler/testData/debug/localVariables/receiverMangling/simpleCapturedReceiverWithParenthesis.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun blockFun(blockArg: String.() -> Unit) = "OK".blockArg() diff --git a/compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt b/compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt index e11ddb0cc5f..edb177bf66a 100644 --- a/compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt +++ b/compiler/testData/debug/localVariables/suspend/completion/nonStaticSimple.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // Code generation problem with JVM backend. // IGNORE_BACKEND: JVM // FILE: test.kt @@ -10,15 +12,15 @@ suspend fun box() { } // EXPECTATIONS JVM JVM_IR -// 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 +// 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 // EXPECTATIONS JS_IR -// test.kt:9 box: $completion=EmptyContinuation -// test.kt:4 : -// test.kt:9 box: $completion=EmptyContinuation -// test.kt:5 foo: $completion=EmptyContinuation +// test.kt:11 box: $completion=EmptyContinuation +// test.kt:6 : +// test.kt:11 box: $completion=EmptyContinuation +// test.kt:7 foo: $completion=EmptyContinuation diff --git a/compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt b/compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt index dad0c88650d..ad8ab3b8583 100644 --- a/compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt +++ b/compiler/testData/debug/localVariables/suspend/completion/nonStaticStateMachine.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // Code generation problem with JVM backend. // IGNORE_BACKEND: JVM // FILE: test.kt @@ -15,29 +17,29 @@ suspend fun box() { } // EXPECTATIONS JVM JVM_IR -// 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: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: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:14 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 -// test.kt:15 box: $completion:kotlin.coroutines.Continuation=Generated_Box_MainKt$main$1 +// 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 // EXPECTATIONS JS_IR -// 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:16 box: $completion=EmptyContinuation +// test.kt:6 : +// test.kt:16 box: $completion=EmptyContinuation +// test.kt:16 box: $completion=EmptyContinuation // test.kt:9 doResume: -// test.kt:10 doResume: dead=kotlin.Long +// 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 diff --git a/compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt b/compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt index 1da33af3d7b..04d78dde765 100644 --- a/compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt +++ b/compiler/testData/debug/localVariables/suspend/completion/staticSimpleReceiver.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // Code generation problem with JVM backend. // IGNORE_BACKEND: JVM // FILE: test.kt @@ -11,15 +13,15 @@ suspend fun box() { // EXPECTATIONS JVM JVM_IR -// 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 +// 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 // EXPECTATIONS JS_IR -// test.kt:9 box: $completion=EmptyContinuation -// test.kt:4 : -// test.kt:9 box: $completion=EmptyContinuation -// test.kt:6 foo: =A, $completion=EmptyContinuation +// test.kt:11 box: $completion=EmptyContinuation +// test.kt:6 : +// test.kt:11 box: $completion=EmptyContinuation +// test.kt:8 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 d3486ff40bd..d1765c2fc8f 100644 --- a/compiler/testData/debug/localVariables/suspend/completion/staticStateMachineReceiver.kt +++ b/compiler/testData/debug/localVariables/suspend/completion/staticStateMachineReceiver.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // Code generation problem with JVM backend. // IGNORE_BACKEND: JVM // FILE: test.kt @@ -17,29 +19,29 @@ suspend fun box() { // The lambda object constructor has a local variables table on the IR backend. // EXPECTATIONS JVM JVM_IR -// 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: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:11 foo1: $continuation:kotlin.coroutines.Continuation=TestKt$foo1$1, $result:java.lang.Object=null, l:long=42:long -// 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 +// 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 // EXPECTATIONS JS_IR -// 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:16 box: $completion=EmptyContinuation +// test.kt:6 : +// test.kt:16 box: $completion=EmptyContinuation +// test.kt:16 box: $completion=EmptyContinuation // test.kt:10 doResume: -// test.kt:11 doResume: dead=kotlin.Long +// 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 diff --git a/compiler/testData/debug/localVariables/suspend/underscoreNames.kt b/compiler/testData/debug/localVariables/suspend/underscoreNames.kt index e2c19d86a36..6cd38122a26 100644 --- a/compiler/testData/debug/localVariables/suspend/underscoreNames.kt +++ b/compiler/testData/debug/localVariables/suspend/underscoreNames.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // WITH_STDLIB // FILE: test.kt @@ -14,40 +16,40 @@ suspend fun box() = foo(A()) { (x_param, _, y_param) -> } // EXPECTATIONS JVM JVM_IR -// 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: +// 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: // EXPECTATIONS JVM -// test.kt:12 invokeSuspend: $result:java.lang.Object=kotlin.Unit, $dstr$x_param$_u24__u24$y_param:A=A +// test.kt:14 invokeSuspend: $result:java.lang.Object=kotlin.Unit, $dstr$x_param$_u24__u24$y_param:A=A // EXPECTATIONS JVM_IR -// test.kt:12 invokeSuspend: $result:java.lang.Object=kotlin.Unit +// test.kt:14 invokeSuspend: $result:java.lang.Object=kotlin.Unit // EXPECTATIONS JVM JVM_IR -// test.kt:7 component3: +// test.kt:9 component3: // EXPECTATIONS JVM_IR -// 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 +// 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 // EXPECTATIONS JVM -// 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 +// 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 // 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: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 +// 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 // EXPECTATIONS JS_IR -// 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 +// 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 diff --git a/compiler/testData/debug/localVariables/tryFinally11.kt b/compiler/testData/debug/localVariables/tryFinally11.kt index 85c1156b8d0..806c2e28956 100644 --- a/compiler/testData/debug/localVariables/tryFinally11.kt +++ b/compiler/testData/debug/localVariables/tryFinally11.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // The local variables `z` and `y` are visible in the finally block with old backend. // IGNORE_BACKEND: JVM // WITH_STDLIB @@ -24,29 +26,29 @@ fun box(): String { } // EXPECTATIONS JVM JVM_IR -// test.kt:7 box: -// test.kt:8 box: -// test.kt:9 box: i:int=0:int -// test.kt:10 box: i:int=0:int -// test.kt:11 box: i:int=0:int, x:java.lang.String="x":java.lang.String +// test.kt:9 box: +// test.kt:10 box: +// test.kt:11 box: i:int=0:int // test.kt:12 box: i:int=0:int -// test.kt:13 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException -// test.kt:14 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String -// test.kt:15 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String, z:java.lang.String="z":java.lang.String -// test.kt:17 box: i:int=0:int -// test.kt:21 box: +// test.kt:13 box: i:int=0:int, x:java.lang.String="x":java.lang.String +// test.kt:14 box: i:int=0:int +// test.kt:15 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException +// test.kt:16 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String +// test.kt:17 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String, z:java.lang.String="z":java.lang.String +// test.kt:19 box: i:int=0:int +// test.kt:23 box: // EXPECTATIONS JS_IR -// test.kt:8 box: -// test.kt:8 box: -// test.kt:8 box: -// test.kt:8 box: i=0:number +// test.kt:10 box: +// test.kt:10 box: +// test.kt:10 box: // test.kt:10 box: i=0:number -// test.kt:11 box: i=0:number, x="x":kotlin.String -// test.kt:12 box: i=0:number, x="x":kotlin.String -// test.kt:12 box: i=0:number, x="x":kotlin.String -// test.kt:13 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException -// test.kt:14 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String -// test.kt:15 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String +// test.kt:12 box: i=0:number +// test.kt:13 box: i=0:number, x="x":kotlin.String +// test.kt:14 box: i=0:number, x="x":kotlin.String +// test.kt:14 box: i=0:number, x="x":kotlin.String +// test.kt:15 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException +// test.kt:16 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String // test.kt:17 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String -// test.kt:21 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String +// test.kt:19 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String +// test.kt:23 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String diff --git a/compiler/testData/debug/localVariables/tryFinally12.kt b/compiler/testData/debug/localVariables/tryFinally12.kt index 54d99fef4cc..c3aaccadb0d 100644 --- a/compiler/testData/debug/localVariables/tryFinally12.kt +++ b/compiler/testData/debug/localVariables/tryFinally12.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // The local variables `z` and `y` are visible in the finally block with old backend. // IGNORE_BACKEND: JVM // WITH_STDLIB @@ -24,29 +26,29 @@ fun box(): String { } // EXPECTATIONS JVM JVM_IR -// test.kt:7 box: -// test.kt:8 box: -// test.kt:9 box: i:int=0:int -// test.kt:10 box: i:int=0:int -// test.kt:11 box: i:int=0:int, x:java.lang.String="x":java.lang.String +// test.kt:9 box: +// test.kt:10 box: +// test.kt:11 box: i:int=0:int // test.kt:12 box: i:int=0:int -// test.kt:13 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException -// test.kt:14 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String -// test.kt:15 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String, z:java.lang.String="z":java.lang.String -// test.kt:17 box: i:int=0:int -// test.kt:21 box: +// test.kt:13 box: i:int=0:int, x:java.lang.String="x":java.lang.String +// test.kt:14 box: i:int=0:int +// test.kt:15 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException +// test.kt:16 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String +// test.kt:17 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String, z:java.lang.String="z":java.lang.String +// test.kt:19 box: i:int=0:int +// test.kt:23 box: // EXPECTATIONS JS_IR -// test.kt:8 box: -// test.kt:8 box: -// test.kt:8 box: -// test.kt:8 box: i=0:number +// test.kt:10 box: +// test.kt:10 box: +// test.kt:10 box: // test.kt:10 box: i=0:number -// test.kt:11 box: i=0:number, x="x":kotlin.String -// test.kt:12 box: i=0:number, x="x":kotlin.String -// test.kt:12 box: i=0:number, x="x":kotlin.String -// test.kt:13 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException -// test.kt:14 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String -// test.kt:15 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String +// test.kt:12 box: i=0:number +// test.kt:13 box: i=0:number, x="x":kotlin.String +// test.kt:14 box: i=0:number, x="x":kotlin.String +// test.kt:14 box: i=0:number, x="x":kotlin.String +// test.kt:15 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException +// test.kt:16 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String // test.kt:17 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String -// test.kt:21 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String +// test.kt:19 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String +// test.kt:23 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String, z="z":kotlin.String diff --git a/compiler/testData/debug/localVariables/tryFinally13.kt b/compiler/testData/debug/localVariables/tryFinally13.kt index d19a8343274..ce6e2cb538a 100644 --- a/compiler/testData/debug/localVariables/tryFinally13.kt +++ b/compiler/testData/debug/localVariables/tryFinally13.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // The local variables `y` and `i` are visible in finally blocks with old backend. // IGNORE_BACKEND: JVM // WITH_STDLIB @@ -23,27 +25,27 @@ fun box(): String { } // EXPECTATIONS JVM JVM_IR -// test.kt:7 box: -// test.kt:8 box: -// test.kt:9 box: i:int=0:int -// test.kt:10 box: i:int=0:int -// test.kt:11 box: i:int=0:int, x:java.lang.String="x":java.lang.String +// test.kt:9 box: +// test.kt:10 box: +// test.kt:11 box: i:int=0:int // test.kt:12 box: i:int=0:int -// test.kt:13 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException -// test.kt:14 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String -// test.kt:16 box: i:int=0:int -// test.kt:20 box: +// test.kt:13 box: i:int=0:int, x:java.lang.String="x":java.lang.String +// test.kt:14 box: i:int=0:int +// test.kt:15 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException +// test.kt:16 box: i:int=0:int, e:java.lang.Exception=java.lang.RuntimeException, y:java.lang.String="y":java.lang.String +// test.kt:18 box: i:int=0:int +// test.kt:22 box: // EXPECTATIONS JS_IR -// test.kt:8 box: -// test.kt:8 box: -// test.kt:8 box: -// test.kt:8 box: i=0:number +// test.kt:10 box: +// test.kt:10 box: +// test.kt:10 box: // test.kt:10 box: i=0:number -// test.kt:11 box: i=0:number, x="x":kotlin.String -// test.kt:12 box: i=0:number, x="x":kotlin.String -// test.kt:12 box: i=0:number, x="x":kotlin.String -// test.kt:13 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException -// test.kt:14 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String +// test.kt:12 box: i=0:number +// test.kt:13 box: i=0:number, x="x":kotlin.String +// test.kt:14 box: i=0:number, x="x":kotlin.String +// test.kt:14 box: i=0:number, x="x":kotlin.String +// test.kt:15 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException // test.kt:16 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String -// test.kt:20 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String +// test.kt:18 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String +// test.kt:22 box: i=0:number, x="x":kotlin.String, e=kotlin.RuntimeException, y="y":kotlin.String diff --git a/compiler/testData/debug/localVariables/tryFinally7.kt b/compiler/testData/debug/localVariables/tryFinally7.kt index cfd77add59f..8436147b326 100644 --- a/compiler/testData/debug/localVariables/tryFinally7.kt +++ b/compiler/testData/debug/localVariables/tryFinally7.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // The old backend has `y` and `j` visible on the finally block. // IGNORE_BACKEND: JVM // WITH_STDLIB @@ -34,36 +36,36 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:32 box: -// test.kt:13 compute: -// test.kt:14 compute: -// test.kt:15 compute: y:int=42:int -// test.kt:16 compute: y:int=42:int, i:int=0:int -// test.kt:18 compute: -// test.kt:19 compute: e:java.lang.Exception=java.lang.RuntimeException -// test.kt:20 compute: e:java.lang.Exception=java.lang.RuntimeException, y:int=32:int -// test.kt:21 compute: e:java.lang.Exception=java.lang.RuntimeException, y:int=32:int, j:int=0:int -// test.kt:7 compute: e:java.lang.Exception=java.lang.RuntimeException, y:int=32:int, j:int=0:int, $i$f$f:int=0:int -// test.kt:22 compute: e:java.lang.Exception=java.lang.RuntimeException, y:int=32:int, j:int=0:int, $i$f$f:int=0:int, $i$a$-f-TestKt$compute$1:int=0:int -// test.kt:26 compute: -// 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 +// test.kt:34 box: +// test.kt:15 compute: +// test.kt:16 compute: +// test.kt:17 compute: y:int=42:int +// test.kt:18 compute: y:int=42:int, i:int=0:int +// test.kt:20 compute: +// test.kt:21 compute: e:java.lang.Exception=java.lang.RuntimeException +// test.kt:22 compute: e:java.lang.Exception=java.lang.RuntimeException, y:int=32:int +// test.kt:23 compute: e:java.lang.Exception=java.lang.RuntimeException, y:int=32:int, j:int=0:int +// test.kt:9 compute: e:java.lang.Exception=java.lang.RuntimeException, y:int=32:int, j:int=0:int, $i$f$f:int=0:int +// test.kt:24 compute: e:java.lang.Exception=java.lang.RuntimeException, y:int=32:int, j:int=0:int, $i$f$f:int=0:int, $i$a$-f-TestKt$compute$1:int=0:int +// test.kt:28 compute: +// 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 // EXPECTATIONS JS_IR -// test.kt:32 box: -// test.kt:14 compute: -// test.kt:15 compute: y=42:number -// test.kt:15 compute: y=42:number -// test.kt:15 compute: y=42:number -// test.kt:15 compute: y=42:number, i=0:number -// test.kt:16 compute: y=42:number, i=0:number +// test.kt:34 box: +// test.kt:16 compute: +// test.kt:17 compute: y=42:number +// test.kt:17 compute: y=42:number +// test.kt:17 compute: y=42:number +// test.kt:17 compute: y=42:number, i=0:number // test.kt:18 compute: y=42:number, i=0:number -// test.kt:18 compute: y=42:number, i=0:number -// test.kt:19 compute: y=42:number, i=0:number, e=kotlin.RuntimeException -// test.kt:20 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number -// test.kt:20 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number -// test.kt:20 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number -// test.kt:20 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number, j=0:number +// test.kt:20 compute: y=42:number, i=0:number +// test.kt:20 compute: y=42:number, i=0:number +// test.kt:21 compute: y=42:number, i=0:number, e=kotlin.RuntimeException +// test.kt:22 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number +// test.kt:22 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number +// test.kt:22 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number // test.kt:22 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number, j=0:number -// test.kt:26 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number, j=0:number +// test.kt:24 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number, j=0:number +// test.kt:28 compute: y=42:number, i=0:number, e=kotlin.RuntimeException, y=32:number, j=0:number diff --git a/compiler/testData/debug/localVariables/tryFinally8.kt b/compiler/testData/debug/localVariables/tryFinally8.kt index 2e7e1729cb4..6fba761745c 100644 --- a/compiler/testData/debug/localVariables/tryFinally8.kt +++ b/compiler/testData/debug/localVariables/tryFinally8.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // The old backend has `y` and `i` visible on the finally block. // IGNORE_BACKEND: JVM // WITH_STDLIB @@ -36,37 +38,37 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:34 box: -// test.kt:20 compute: -// test.kt:21 compute: -// test.kt:22 compute: y:int=42:int -// test.kt:23 compute: y:int=42:int, i:int=0:int -// test.kt:7 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int -// test.kt:8 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int -// test.kt:9 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, z$iv:int=32:int -// test.kt:10 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, z$iv:int=32:int, j$iv:int=0:int -// test.kt:12 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int -// test.kt:13 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, e$iv:java.lang.Exception=java.lang.RuntimeException -// test.kt:24 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, e$iv:java.lang.Exception=java.lang.RuntimeException, $i$a$-f-TestKt$compute$1:int=0:int -// test.kt:28 compute: -// 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 +// test.kt:36 box: +// test.kt:22 compute: +// test.kt:23 compute: +// test.kt:24 compute: y:int=42:int +// test.kt:25 compute: y:int=42:int, i:int=0:int +// test.kt:9 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int +// test.kt:10 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int +// test.kt:11 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, z$iv:int=32:int +// test.kt:12 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, z$iv:int=32:int, j$iv:int=0:int +// test.kt:14 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int +// test.kt:15 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, e$iv:java.lang.Exception=java.lang.RuntimeException +// test.kt:26 compute: y:int=42:int, i:int=0:int, $i$f$f:int=0:int, e$iv:java.lang.Exception=java.lang.RuntimeException, $i$a$-f-TestKt$compute$1:int=0:int +// test.kt:30 compute: +// test.kt:36 box: +// test.kt:37 box: result:java.lang.String="NON_LOCAL_RETURN":java.lang.String +// test.kt:38 box: result:java.lang.String="NON_LOCAL_RETURN":java.lang.String, localX:java.lang.String="OK":java.lang.String // EXPECTATIONS JS_IR -// test.kt:34 box: -// test.kt:21 compute: -// test.kt:22 compute: y=42:number -// test.kt:22 compute: y=42:number -// test.kt:22 compute: y=42:number -// test.kt:22 compute: y=42:number, i=0:number -// test.kt:8 compute: y=42:number, i=0:number -// test.kt:9 compute: y=42:number, i=0:number, z=32:number -// test.kt:9 compute: y=42:number, i=0:number, z=32:number -// test.kt:9 compute: y=42:number, i=0:number, z=32:number -// test.kt:9 compute: y=42:number, i=0:number, z=32:number, j=0:number -// test.kt:10 compute: y=42:number, i=0:number, z=32:number, j=0:number +// test.kt:36 box: +// test.kt:23 compute: +// test.kt:24 compute: y=42:number +// test.kt:24 compute: y=42:number +// test.kt:24 compute: y=42:number +// test.kt:24 compute: y=42:number, i=0:number +// test.kt:10 compute: y=42:number, i=0:number +// test.kt:11 compute: y=42:number, i=0:number, z=32:number +// test.kt:11 compute: y=42:number, i=0:number, z=32:number +// test.kt:11 compute: y=42:number, i=0:number, z=32:number +// test.kt:11 compute: y=42:number, i=0:number, z=32:number, j=0:number // test.kt:12 compute: y=42:number, i=0:number, z=32:number, j=0:number -// test.kt:12 compute: y=42:number, i=0:number, z=32:number, j=0:number -// test.kt:24 compute: y=42:number, i=0:number, z=32:number, j=0:number, e=kotlin.RuntimeException -// test.kt:28 compute: y=42:number, i=0:number, z=32:number, j=0:number, e=kotlin.RuntimeException +// test.kt:14 compute: y=42:number, i=0:number, z=32:number, j=0:number +// test.kt:14 compute: y=42:number, i=0:number, z=32:number, j=0:number +// test.kt:26 compute: y=42:number, i=0:number, z=32:number, j=0:number, e=kotlin.RuntimeException +// test.kt:30 compute: y=42:number, i=0:number, z=32:number, j=0:number, e=kotlin.RuntimeException diff --git a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt index 8037c7228eb..0f34959275b 100644 --- a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt +++ b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt @@ -1,4 +1,5 @@ - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt inline fun foo(stringMaker: () -> String = { "OK" }): String { return stringMaker() @@ -18,21 +19,21 @@ fun box(): String { } // EXPECTATIONS JVM JVM_IR -// test.kt:15 box -// test.kt:3 box -// test.kt:4 box -// test.kt:3 box -// test.kt:4 box // test.kt:16 box -// test.kt:7 box -// test.kt:11 box -// test.kt:8 box -// test.kt:11 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:3 box // test.kt:4 box -// test.kt:8 box -// test.kt:11 box -// test.kt:17 box +// test.kt:5 box +// test.kt:9 box +// test.kt:12 box +// test.kt:18 box diff --git a/compiler/testData/debug/stepping/throwException.kt b/compiler/testData/debug/stepping/throwException.kt index 8c01a89366f..c6ae2cd4404 100644 --- a/compiler/testData/debug/stepping/throwException.kt +++ b/compiler/testData/debug/stepping/throwException.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun box() { val a = 1 @@ -15,25 +17,25 @@ fun throwIfLess(a: Int, b: Int) { throw IllegalStateException() } // EXPECTATIONS JVM JVM_IR -// test.kt:3 box -// test.kt:4 box // test.kt:5 box // test.kt:6 box -// test.kt:14 throwIfLess -// test.kt:15 throwIfLess // test.kt:7 box // test.kt:8 box -// test.kt:14 throwIfLess -// test.kt:15 throwIfLess +// test.kt:16 throwIfLess +// test.kt:17 throwIfLess +// test.kt:9 box +// test.kt:10 box +// test.kt:16 throwIfLess +// test.kt:17 throwIfLess // EXPECTATIONS JS_IR -// test.kt:3 box -// test.kt:4 box +// test.kt:5 box // test.kt:6 box -// test.kt:14 throwIfLess -// test.kt:15 throwIfLess -// test.kt:7 box -// test.kt:7 box // test.kt:8 box -// test.kt:14 throwIfLess -// test.kt:15 throwIfLess +// test.kt:16 throwIfLess +// test.kt:17 throwIfLess +// test.kt:9 box +// test.kt:9 box +// test.kt:10 box +// test.kt:16 throwIfLess +// test.kt:17 throwIfLess diff --git a/compiler/testData/debug/stepping/tryCatch.kt b/compiler/testData/debug/stepping/tryCatch.kt index 661d04ddd6b..3146f04dcfd 100644 --- a/compiler/testData/debug/stepping/tryCatch.kt +++ b/compiler/testData/debug/stepping/tryCatch.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun foo(shouldThrow: Boolean) { @@ -15,28 +17,28 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:13 box -// test.kt:4 foo -// test.kt:5 foo -// test.kt:9 foo -// test.kt:10 foo -// test.kt:14 box -// test.kt:4 foo -// test.kt:5 foo +// test.kt:15 box // test.kt:6 foo // test.kt:7 foo +// test.kt:11 foo +// test.kt:12 foo +// test.kt:16 box +// test.kt:6 foo +// test.kt:7 foo +// test.kt:8 foo // test.kt:9 foo -// test.kt:10 foo -// test.kt:15 box +// test.kt:11 foo +// test.kt:12 foo +// test.kt:17 box // EXPECTATIONS JS_IR -// test.kt:13 box -// test.kt:5 foo -// test.kt:10 foo -// test.kt:14 box -// test.kt:5 foo -// test.kt:5 foo -// test.kt:6 foo -// test.kt:6 foo -// test.kt:10 foo // test.kt:15 box +// test.kt:7 foo +// test.kt:12 foo +// test.kt:16 box +// test.kt:7 foo +// test.kt:7 foo +// test.kt:8 foo +// test.kt:8 foo +// test.kt:12 foo +// test.kt:17 box diff --git a/compiler/testData/debug/stepping/tryCatchExpression.kt b/compiler/testData/debug/stepping/tryCatchExpression.kt index 55f9ee7ce5b..4cbf582b5c2 100644 --- a/compiler/testData/debug/stepping/tryCatchExpression.kt +++ b/compiler/testData/debug/stepping/tryCatchExpression.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun foo() { @@ -48,108 +50,108 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:41 box -// test.kt:4 foo -// test.kt:5 foo -// test.kt:28 mightThrow -// test.kt:29 mightThrow -// test.kt:5 foo -// test.kt:10 foo -// test.kt:11 foo -// test.kt:32 mightThrow2 -// test.kt:33 mightThrow2 -// test.kt:11 foo -// test.kt:10 foo -// test.kt:16 foo -// test.kt:17 foo -// test.kt:36 mightThrow3 -// test.kt:37 mightThrow3 -// test.kt:17 foo -// test.kt:16 foo -// test.kt:21 foo -// test.kt:42 box // test.kt:43 box -// test.kt:4 foo -// test.kt:5 foo -// test.kt:28 mightThrow -// test.kt:29 mightThrow -// test.kt:5 foo -// test.kt:10 foo -// test.kt:11 foo -// test.kt:32 mightThrow2 -// test.kt:33 mightThrow2 -// test.kt:11 foo -// test.kt:10 foo -// test.kt:16 foo -// test.kt:17 foo -// test.kt:36 mightThrow3 -// test.kt:18 foo -// test.kt:19 foo -// test.kt:44 box -// test.kt:45 box -// test.kt:4 foo -// test.kt:5 foo -// test.kt:28 mightThrow -// test.kt:29 mightThrow -// test.kt:5 foo -// test.kt:10 foo -// test.kt:11 foo -// test.kt:32 mightThrow2 -// test.kt:12 foo -// test.kt:13 foo -// test.kt:46 box -// test.kt:47 box -// test.kt:4 foo -// test.kt:5 foo -// test.kt:28 mightThrow // test.kt:6 foo // test.kt:7 foo +// test.kt:30 mightThrow +// test.kt:31 mightThrow +// test.kt:7 foo +// test.kt:12 foo +// test.kt:13 foo +// test.kt:34 mightThrow2 +// test.kt:35 mightThrow2 +// test.kt:13 foo +// test.kt:12 foo +// test.kt:18 foo +// test.kt:19 foo +// test.kt:38 mightThrow3 +// test.kt:39 mightThrow3 +// test.kt:19 foo +// test.kt:18 foo +// test.kt:23 foo +// test.kt:44 box +// test.kt:45 box +// test.kt:6 foo +// test.kt:7 foo +// test.kt:30 mightThrow +// test.kt:31 mightThrow +// test.kt:7 foo +// test.kt:12 foo +// test.kt:13 foo +// test.kt:34 mightThrow2 +// test.kt:35 mightThrow2 +// test.kt:13 foo +// test.kt:12 foo +// test.kt:18 foo +// test.kt:19 foo +// test.kt:38 mightThrow3 +// test.kt:20 foo +// test.kt:21 foo +// test.kt:46 box +// test.kt:47 box +// test.kt:6 foo +// test.kt:7 foo +// test.kt:30 mightThrow +// test.kt:31 mightThrow +// test.kt:7 foo +// test.kt:12 foo +// test.kt:13 foo +// test.kt:34 mightThrow2 +// test.kt:14 foo +// test.kt:15 foo // test.kt:48 box +// test.kt:49 box +// test.kt:6 foo +// test.kt:7 foo +// test.kt:30 mightThrow +// test.kt:8 foo +// test.kt:9 foo +// test.kt:50 box // EXPECTATIONS JS_IR -// test.kt:41 box -// test.kt:5 foo -// test.kt:28 mightThrow -// test.kt:29 mightThrow -// test.kt:11 foo -// test.kt:32 mightThrow2 -// test.kt:33 mightThrow2 -// test.kt:10 foo -// test.kt:17 foo -// test.kt:36 mightThrow3 -// test.kt:37 mightThrow3 -// test.kt:16 foo -// test.kt:21 foo -// test.kt:42 box // test.kt:43 box -// test.kt:5 foo -// test.kt:28 mightThrow -// test.kt:29 mightThrow -// test.kt:11 foo -// test.kt:32 mightThrow2 -// test.kt:33 mightThrow2 -// test.kt:10 foo -// test.kt:17 foo -// test.kt:36 mightThrow3 -// test.kt:36 mightThrow3 -// test.kt:18 foo +// test.kt:7 foo +// test.kt:30 mightThrow +// test.kt:31 mightThrow +// test.kt:13 foo +// test.kt:34 mightThrow2 +// test.kt:35 mightThrow2 +// test.kt:12 foo // test.kt:19 foo +// test.kt:38 mightThrow3 +// test.kt:39 mightThrow3 +// test.kt:18 foo +// test.kt:23 foo // test.kt:44 box // test.kt:45 box -// test.kt:5 foo -// test.kt:28 mightThrow -// test.kt:29 mightThrow -// test.kt:11 foo -// test.kt:32 mightThrow2 -// test.kt:32 mightThrow2 -// test.kt:12 foo +// test.kt:7 foo +// test.kt:30 mightThrow +// test.kt:31 mightThrow // test.kt:13 foo +// test.kt:34 mightThrow2 +// test.kt:35 mightThrow2 +// test.kt:12 foo +// test.kt:19 foo +// test.kt:38 mightThrow3 +// test.kt:38 mightThrow3 +// test.kt:20 foo +// test.kt:21 foo // test.kt:46 box // test.kt:47 box -// test.kt:5 foo -// test.kt:28 mightThrow -// test.kt:28 mightThrow -// test.kt:6 foo -// test.kt:6 foo // test.kt:7 foo +// test.kt:30 mightThrow +// test.kt:31 mightThrow +// test.kt:13 foo +// test.kt:34 mightThrow2 +// test.kt:34 mightThrow2 +// test.kt:14 foo +// test.kt:15 foo // test.kt:48 box +// test.kt:49 box +// test.kt:7 foo +// test.kt:30 mightThrow +// test.kt:30 mightThrow +// test.kt:8 foo +// test.kt:8 foo +// test.kt:9 foo +// test.kt:50 box diff --git a/compiler/testData/debug/stepping/tryCatchFinally.kt b/compiler/testData/debug/stepping/tryCatchFinally.kt index 0689446f673..f2125e57a81 100644 --- a/compiler/testData/debug/stepping/tryCatchFinally.kt +++ b/compiler/testData/debug/stepping/tryCatchFinally.kt @@ -1,4 +1,5 @@ - +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun foo() { @@ -39,93 +40,93 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:34 box -// test.kt:5 foo -// test.kt:6 foo -// test.kt:26 mightThrow -// test.kt:27 mightThrow -// test.kt:10 foo -// test.kt:11 foo -// test.kt:13 foo -// test.kt:14 foo -// test.kt:30 mightThrow2 -// test.kt:31 mightThrow2 -// test.kt:14 foo -// test.kt:18 foo -// test.kt:19 foo -// test.kt:13 foo -// test.kt:20 foo // test.kt:35 box -// test.kt:36 box -// test.kt:5 foo // test.kt:6 foo -// test.kt:26 mightThrow -// test.kt:27 mightThrow -// test.kt:10 foo -// test.kt:11 foo -// test.kt:13 foo -// test.kt:14 foo -// test.kt:30 mightThrow2 -// test.kt:15 foo -// test.kt:16 foo -// test.kt:18 foo -// test.kt:19 foo -// test.kt:13 foo -// test.kt:20 foo -// test.kt:37 box -// test.kt:38 box -// test.kt:5 foo -// test.kt:6 foo -// test.kt:26 mightThrow // test.kt:7 foo -// test.kt:8 foo -// test.kt:10 foo +// test.kt:27 mightThrow +// test.kt:28 mightThrow // test.kt:11 foo -// test.kt:13 foo +// test.kt:12 foo // test.kt:14 foo -// test.kt:30 mightThrow2 // test.kt:15 foo -// test.kt:16 foo -// test.kt:18 foo +// test.kt:31 mightThrow2 +// test.kt:32 mightThrow2 +// test.kt:15 foo // test.kt:19 foo -// test.kt:13 foo // test.kt:20 foo +// test.kt:14 foo +// test.kt:21 foo +// test.kt:36 box +// test.kt:37 box +// test.kt:6 foo +// test.kt:7 foo +// test.kt:27 mightThrow +// test.kt:28 mightThrow +// test.kt:11 foo +// test.kt:12 foo +// test.kt:14 foo +// test.kt:15 foo +// test.kt:31 mightThrow2 +// test.kt:16 foo +// test.kt:17 foo +// test.kt:19 foo +// test.kt:20 foo +// test.kt:14 foo +// test.kt:21 foo +// test.kt:38 box // test.kt:39 box +// test.kt:6 foo +// test.kt:7 foo +// test.kt:27 mightThrow +// test.kt:8 foo +// test.kt:9 foo +// test.kt:11 foo +// test.kt:12 foo +// test.kt:14 foo +// test.kt:15 foo +// test.kt:31 mightThrow2 +// test.kt:16 foo +// test.kt:17 foo +// test.kt:19 foo +// test.kt:20 foo +// test.kt:14 foo +// test.kt:21 foo +// test.kt:40 box // EXPECTATIONS JS_IR -// test.kt:34 box -// test.kt:6 foo -// test.kt:26 mightThrow -// test.kt:27 mightThrow -// test.kt:14 foo -// test.kt:30 mightThrow2 -// test.kt:31 mightThrow2 -// test.kt:13 foo -// test.kt:20 foo // test.kt:35 box -// test.kt:36 box -// test.kt:6 foo -// test.kt:26 mightThrow +// test.kt:7 foo // test.kt:27 mightThrow -// test.kt:14 foo -// test.kt:30 mightThrow2 -// test.kt:30 mightThrow2 +// test.kt:28 mightThrow // test.kt:15 foo -// test.kt:16 foo -// test.kt:13 foo -// test.kt:20 foo +// test.kt:31 mightThrow2 +// test.kt:32 mightThrow2 +// test.kt:14 foo +// test.kt:21 foo +// test.kt:36 box // test.kt:37 box -// test.kt:38 box -// test.kt:6 foo -// test.kt:26 mightThrow -// test.kt:26 mightThrow // test.kt:7 foo -// test.kt:7 foo -// test.kt:14 foo -// test.kt:30 mightThrow2 -// test.kt:30 mightThrow2 +// test.kt:27 mightThrow +// test.kt:28 mightThrow // test.kt:15 foo +// test.kt:31 mightThrow2 +// test.kt:31 mightThrow2 // test.kt:16 foo -// test.kt:13 foo -// test.kt:20 foo +// test.kt:17 foo +// test.kt:14 foo +// test.kt:21 foo +// test.kt:38 box // test.kt:39 box +// test.kt:7 foo +// test.kt:27 mightThrow +// test.kt:27 mightThrow +// test.kt:8 foo +// test.kt:8 foo +// test.kt:15 foo +// test.kt:31 mightThrow2 +// test.kt:31 mightThrow2 +// test.kt:16 foo +// test.kt:17 foo +// test.kt:14 foo +// test.kt:21 foo +// test.kt:40 box diff --git a/compiler/testData/debug/stepping/whenIsChecks.kt b/compiler/testData/debug/stepping/whenIsChecks.kt index 56dfe49e580..e70ce26674f 100644 --- a/compiler/testData/debug/stepping/whenIsChecks.kt +++ b/compiler/testData/debug/stepping/whenIsChecks.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun foo(x: Any) { @@ -18,36 +20,36 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:15 box -// test.kt:4 foo -// test.kt:5 foo +// test.kt:17 box // 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:12 foo -// 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: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 // 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:4 foo -// test.kt:5 foo -// test.kt:12 foo -// test.kt:18 box \ No newline at end of file +// test.kt:6 foo +// test.kt:7 foo +// test.kt:14 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 b2912c641c4..e5d10f80225 100644 --- a/compiler/testData/debug/stepping/whenNullalbeSubject.kt +++ b/compiler/testData/debug/stepping/whenNullalbeSubject.kt @@ -1,3 +1,5 @@ +// IGNORE_BACKEND_K2_LIGHT_TREE: JVM_IR +// Reason: KT-56755 // FILE: test.kt fun box() { @@ -16,15 +18,15 @@ fun box() { } // EXPECTATIONS JVM JVM_IR -// test.kt:4 box -// test.kt:5 box // test.kt:6 box -// test.kt:9 box -// test.kt:13 box -// test.kt:16 box +// test.kt:7 box +// test.kt:8 box +// test.kt:11 box +// test.kt:15 box +// test.kt:18 box // EXPECTATIONS JS_IR -// test.kt:4 box -// test.kt:5 box -// test.kt:5 box -// test.kt:16 box +// test.kt:6 box +// test.kt:7 box +// test.kt:7 box +// test.kt:18 box diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/SteppingTestUtils.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/SteppingTestUtils.kt index e39038b655c..dba2c63cd6a 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/SteppingTestUtils.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/SteppingTestUtils.kt @@ -114,6 +114,9 @@ fun checkSteppingTestResult( } actualLineNumbersIterator.forEach { actual.add(it) } + if (actual.last().isNotBlank()) { + actual.add("") + } assertEqualsToFile(wholeFile, actual.joinToString("\n")) }