From c3dbb44e5f399bc5e541262c1e4e4315c649e846 Mon Sep 17 00:00:00 2001 From: Kristoffer Andersen Date: Mon, 7 Mar 2022 18:03:21 +0100 Subject: [PATCH] [IR] Adjust LVT test expectations and mute accordingly --- .../testData/debug/localVariables/assignment.kt | 15 ++------------- .../assignmentCustomComponentNsMultiline.kt | 7 ++----- .../destructuring/assignmentMultiline.kt | 5 ++--- .../destructuring/assignmentUnderscoreNames.kt | 7 ------- .../assignmentUnderscoreNamesMultiline.kt | 3 +-- .../destructuring/forLoopMultiline.kt | 8 +++----- .../debug/localVariables/destructuring/lambda.kt | 6 +++--- .../destructuring/lambdaCustomComponentNs.kt | 6 +++--- .../destructuring/lambdaMultipleDestructs.kt | 6 +++--- .../debug/localVariables/forLoopMultiline.kt | 6 +++--- 10 files changed, 22 insertions(+), 47 deletions(-) diff --git a/compiler/testData/debug/localVariables/assignment.kt b/compiler/testData/debug/localVariables/assignment.kt index 1d5b10adc7f..3562b84ca61 100644 --- a/compiler/testData/debug/localVariables/assignment.kt +++ b/compiler/testData/debug/localVariables/assignment.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // FILE: test.kt fun box(): String { val @@ -13,20 +13,9 @@ fun box(): String { 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 \ No newline at end of file diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt b/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt index 30615485d1d..576b16ca647 100644 --- a/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt +++ b/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt @@ -1,5 +1,5 @@ - // IGNORE_BACKEND_FIR: JVM_IR +// IGNORE_BACKEND: JVM_IR // FILE: test.kt class MyPair(val x: String, val y: String) { operator fun component1(): String { @@ -39,11 +39,8 @@ fun box(): 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 \ No newline at end of file +// test.kt:24 box: p:MyPair=MyPair, o:java.lang.String="O":java.lang.String, k:java.lang.String="K":java.lang.String diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt b/compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt index afa46ac512c..8c465f9f1fe 100644 --- a/compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt +++ b/compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt @@ -1,6 +1,6 @@ // WITH_STDLIB - // IGNORE_BACKEND_FIR: JVM_IR +// IGNORE_BACKEND: JVM_IR // FILE: test.kt fun box(): String { val p = "O" to "K" @@ -29,6 +29,5 @@ fun box(): 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 \ No newline at end of file +// 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 diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNames.kt b/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNames.kt index 4eec9542135..8fc35792821 100644 --- a/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNames.kt +++ b/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNames.kt @@ -10,13 +10,6 @@ fun box(): String { } // 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 \ No newline at end of file diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt b/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt index fec99127fb7..2d799290d5b 100644 --- a/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt +++ b/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt @@ -1,6 +1,6 @@ // WITH_STDLIB - // IGNORE_BACKEND_FIR: JVM_IR +// IGNORE_BACKEND: JVM_IR // FILE: test.kt fun box(): String { val p = Triple("X","O","K") @@ -35,7 +35,6 @@ fun box(): String { // 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 \ No newline at end of file diff --git a/compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt b/compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt index f8edf917884..1f9e06cf154 100644 --- a/compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt +++ b/compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt @@ -1,6 +1,6 @@ // WITH_STDLIB - // IGNORE_BACKEND_FIR: JVM_IR +// IGNORE_BACKEND: JVM_IR // FILE: test.kt fun box() { val map: Map = mapOf("1" to "23") @@ -41,10 +41,8 @@ fun box() { // 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 \ No newline at end of file +// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap +// test.kt:21 box: map:java.util.Map=java.util.Collections$SingletonMap diff --git a/compiler/testData/debug/localVariables/destructuring/lambda.kt b/compiler/testData/debug/localVariables/destructuring/lambda.kt index 135bd528f0b..07366c66eb0 100644 --- a/compiler/testData/debug/localVariables/destructuring/lambda.kt +++ b/compiler/testData/debug/localVariables/destructuring/lambda.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // FILE: test.kt data class A(val x: String, val y: Int) @@ -25,7 +25,7 @@ fun box() { // test.kt:4 : 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:9 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:10 box: \ No newline at end of file diff --git a/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt b/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt index 8fc792eeecd..7063737e3e5 100644 --- a/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt +++ b/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // FILE: test.kt class MyPair(val x: String, val y: String) { operator fun component1(): String { @@ -42,7 +42,7 @@ fun box() { // 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:17 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:18 box: \ No newline at end of file diff --git a/compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt b/compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt index a36b4d90d6d..81ae36f0ccf 100644 --- a/compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt +++ b/compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt @@ -1,5 +1,5 @@ - - +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // FILE: test.kt data class A(val x: String, val y: Int) @@ -30,7 +30,7 @@ fun box() { // test.kt:4 : 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:9 invoke: x:java.lang.String="O":java.lang.String, y:int=123:int, z:java.lang.String="K":java.lang.String, w:int=877:int // 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: \ No newline at end of file diff --git a/compiler/testData/debug/localVariables/forLoopMultiline.kt b/compiler/testData/debug/localVariables/forLoopMultiline.kt index aad8bae298a..56480266b61 100644 --- a/compiler/testData/debug/localVariables/forLoopMultiline.kt +++ b/compiler/testData/debug/localVariables/forLoopMultiline.kt @@ -1,6 +1,6 @@ // WITH_STDLIB - // IGNORE_BACKEND_FIR: JVM_IR +// IGNORE_BACKEND: JVM_IR // FILE: test.kt fun box() { val map: Map = mapOf("1" to "23") @@ -31,5 +31,5 @@ fun 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 \ No newline at end of file +// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap +// test.kt:17 box: map:java.util.Map=java.util.Collections$SingletonMap