From dd49d3532087cffe6c5144c085efdc78cdd9bb95 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Mon, 3 Dec 2018 13:56:31 +0900
Subject: [PATCH] Fix backend tests after changing format of synthetic
 variables for inline functions

---
 .../destructuringInSuspendLambda/inline.kt                | 2 +-
 .../checkLocalVariablesTable/destructuringInlineLambda.kt | 2 +-
 .../checkLocalVariablesTable/inlineLambdaWithItParam.kt   | 2 +-
 .../checkLocalVariablesTable/inlineLambdaWithParam.kt     | 4 ++--
 .../testData/checkLocalVariablesTable/inlineSimple.kt     | 2 +-
 .../checkLocalVariablesTable/inlineSimpleChain.kt         | 4 ++--
 .../codegen/asmLike/receiverMangling/deepInline.txt       | 8 ++++----
 .../asmLike/receiverMangling/deepInlineWithLabels.txt     | 8 ++++----
 .../asmLike/receiverMangling/inlineClassCapture.txt       | 6 +++---
 .../codegen/asmLike/receiverMangling/inlineReceivers.txt  | 4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt
index c8938a7c11c..5b6b92b2891 100644
--- a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt
+++ b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt
@@ -12,6 +12,6 @@ suspend fun test() = foo(A("O", "K")) { (x_param, y_param) -> x_param + y_param
 // VARIABLE : NAME=$x_param_y_param TYPE=LA; INDEX=5
 // VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=6
 // VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=7
-// VARIABLE : NAME=$i$a$2$foo TYPE=I INDEX=2
+// VARIABLE : NAME=$i$a$-foo-InlineKt$test$2 TYPE=I INDEX=2
 // VARIABLE : NAME=a$iv TYPE=LA; INDEX=1
 // VARIABLE : NAME=$i$f$foo TYPE=I INDEX=8
diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInlineLambda.kt b/compiler/testData/checkLocalVariablesTable/destructuringInlineLambda.kt
index b33eaecfead..1b4f0eb2699 100644
--- a/compiler/testData/checkLocalVariablesTable/destructuringInlineLambda.kt
+++ b/compiler/testData/checkLocalVariablesTable/destructuringInlineLambda.kt
@@ -19,5 +19,5 @@ fun box(): String {
 // VARIABLE : NAME=a1 TYPE=Ljava/lang/String; INDEX=2
 // VARIABLE : NAME=a2 TYPE=Ljava/lang/String; INDEX=3
 // VARIABLE : NAME=a3 TYPE=I INDEX=4
-// VARIABLE : NAME=$i$a$1$foo TYPE=I INDEX=5
+// VARIABLE : NAME=$i$a$-foo-DestructuringInlineLambdaKt$box$1 TYPE=I INDEX=5
 // VARIABLE : NAME=$i$f$foo TYPE=I INDEX=6
diff --git a/compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt b/compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt
index 9e08a778ce2..8d7dd5c6113 100644
--- a/compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt
+++ b/compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt
@@ -14,7 +14,7 @@ class A {
 // METHOD : A.foo()V
 // VARIABLE : NAME=zzz TYPE=I INDEX=3
 // VARIABLE : NAME=it TYPE=I INDEX=2
-// VARIABLE : NAME=$i$a$1$inlineFun TYPE=I INDEX=4
+// VARIABLE : NAME=$i$a$-inlineFun-A$foo$1 TYPE=I INDEX=4
 // VARIABLE : NAME=this_$iv TYPE=LA; INDEX=1
 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=5
 // VARIABLE : NAME=this TYPE=LA; INDEX=0
diff --git a/compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt b/compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt
index 1ad2b6198b6..179c6d416ee 100644
--- a/compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt
+++ b/compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt
@@ -16,10 +16,10 @@ class A {
 // METHOD : A.foo()V
 // VARIABLE : NAME=zzz TYPE=I INDEX=4
 // VARIABLE : NAME=l TYPE=I INDEX=3
-// VARIABLE : NAME=$i$a$1$inlineFun TYPE=I INDEX=5
+// VARIABLE : NAME=$i$a$-inlineFun-A$foo$1 TYPE=I INDEX=5
 // VARIABLE : NAME=zzz TYPE=I INDEX=4
 // VARIABLE : NAME=l TYPE=I INDEX=3
-// VARIABLE : NAME=$i$a$1$inlineFun TYPE=I INDEX=5
+// VARIABLE : NAME=$i$a$-inlineFun-A$foo$1 TYPE=I INDEX=5
 // VARIABLE : NAME=this_$iv TYPE=LA; INDEX=1
 // VARIABLE : NAME=p$iv TYPE=I INDEX=2
 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=6
diff --git a/compiler/testData/checkLocalVariablesTable/inlineSimple.kt b/compiler/testData/checkLocalVariablesTable/inlineSimple.kt
index 5659ed86658..14279d56186 100644
--- a/compiler/testData/checkLocalVariablesTable/inlineSimple.kt
+++ b/compiler/testData/checkLocalVariablesTable/inlineSimple.kt
@@ -14,7 +14,7 @@ class A {
 
 // METHOD : A.foo()V
 // VARIABLE : NAME=zzz TYPE=I INDEX=3
-// VARIABLE : NAME=$i$a$1$inlineFun TYPE=I INDEX=4
+// VARIABLE : NAME=$i$a$-inlineFun-A$foo$1 TYPE=I INDEX=4
 // VARIABLE : NAME=this_$iv TYPE=LA; INDEX=2
 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=5
 // VARIABLE : NAME=s TYPE=I INDEX=1
diff --git a/compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt b/compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt
index 625ecd9dbd7..fdee4f1eef3 100644
--- a/compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt
+++ b/compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt
@@ -19,11 +19,11 @@ class A {
 
 // METHOD : A.foo()V
 // VARIABLE : NAME=zz2 TYPE=I INDEX=5
-// VARIABLE : NAME=$i$a$1$inlineFun TYPE=I INDEX=6
+// VARIABLE : NAME=$i$a$-inlineFun-A$foo$1$1 TYPE=I INDEX=6
 // VARIABLE : NAME=this_$iv TYPE=LA; INDEX=4
 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=7
 // VARIABLE : NAME=z TYPE=I INDEX=3
-// VARIABLE : NAME=$i$a$1$inlineFun TYPE=I INDEX=8
+// VARIABLE : NAME=$i$a$-inlineFun-A$foo$1 TYPE=I INDEX=8
 // VARIABLE : NAME=this_$iv TYPE=LA; INDEX=2
 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=9
 // VARIABLE : NAME=s TYPE=I INDEX=1
diff --git a/compiler/testData/codegen/asmLike/receiverMangling/deepInline.txt b/compiler/testData/codegen/asmLike/receiverMangling/deepInline.txt
index 6122b578b04..97858e7e99c 100644
--- a/compiler/testData/codegen/asmLike/receiverMangling/deepInline.txt
+++ b/compiler/testData/codegen/asmLike/receiverMangling/deepInline.txt
@@ -5,18 +5,18 @@ public final class DeepInlineKt : java/lang/Object {
             1 $i$f$block: I
     }
 
-    public final static void foo(java.lang.String $receiver, int $i$a$1$block) {
+    public final static void foo(java.lang.String $receiver, int $i$a$-block-DeepInlineKt$foo$1$1$1) {
         Local variables:
             9 $receiver: J
-            11 $i$a$1$block: I
+            11 $i$a$-block-DeepInlineKt$foo$1$1$1: I
             12 $i$f$block: I
             8 z: Z
             6 $receiver: J
-            13 $i$a$1$block: I
+            13 $i$a$-block-DeepInlineKt$foo$1$1: I
             14 $i$f$block: I
             5 y: Z
             3 $receiver: J
-            15 $i$a$1$block: I
+            15 $i$a$-block-DeepInlineKt$foo$1: I
             16 $i$f$block: I
             2 x: Z
             0 $receiver: Ljava/lang/String;
diff --git a/compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.txt b/compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.txt
index bc71c62f4c4..39085a79839 100644
--- a/compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.txt
+++ b/compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.txt
@@ -5,18 +5,18 @@ public final class DeepInlineWithLabelsKt : java/lang/Object {
             1 $i$f$block: I
     }
 
-    public final static void foo(java.lang.String $receiver, int $i$a$1$block) {
+    public final static void foo(java.lang.String $receiver, int $i$a$-block-DeepInlineWithLabelsKt$foo$1$1$1) {
         Local variables:
             9 $receiver: J
-            11 $i$a$1$block: I
+            11 $i$a$-block-DeepInlineWithLabelsKt$foo$1$1$1: I
             12 $i$f$block: I
             8 z: Z
             6 $receiver: J
-            13 $i$a$1$block: I
+            13 $i$a$-block-DeepInlineWithLabelsKt$foo$1$1: I
             14 $i$f$block: I
             5 y: Z
             3 $receiver: J
-            15 $i$a$1$block: I
+            15 $i$a$-block-DeepInlineWithLabelsKt$foo$1: I
             16 $i$f$block: I
             2 x: Z
             0 $receiver: Ljava/lang/String;
diff --git a/compiler/testData/codegen/asmLike/receiverMangling/inlineClassCapture.txt b/compiler/testData/codegen/asmLike/receiverMangling/inlineClassCapture.txt
index 9c1345629e7..875e73e9dec 100644
--- a/compiler/testData/codegen/asmLike/receiverMangling/inlineClassCapture.txt
+++ b/compiler/testData/codegen/asmLike/receiverMangling/inlineClassCapture.txt
@@ -9,9 +9,9 @@ public final class Foo$Bar : java/lang/Object {
 
     public final void bar() {
         Local variables:
-            1 $i$a$1$block: I
+            1 $i$a$-block-Foo$Bar$bar$1$1: I
             2 $i$f$block: I
-            3 $i$a$1$block: I
+            3 $i$a$-block-Foo$Bar$bar$1: I
             4 $i$f$block: I
             0 this: LFoo$Bar;
     }
@@ -25,7 +25,7 @@ public final class Foo : java/lang/Object {
 
     public final void foo() {
         Local variables:
-            1 $i$a$1$block: I
+            1 $i$a$-block-Foo$foo$1: I
             2 $i$f$block: I
             0 this: LFoo;
     }
diff --git a/compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.txt b/compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.txt
index 97c2b099228..7b1cd81fee5 100644
--- a/compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.txt
+++ b/compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.txt
@@ -5,10 +5,10 @@ public final class InlineReceiversKt : java/lang/Object {
             1 $i$f$block: I
     }
 
-    public final static void foo(java.lang.String $receiver, int $i$a$1$block) {
+    public final static void foo(java.lang.String $receiver, int $i$a$-block-InlineReceiversKt$foo$1) {
         Local variables:
             3 $receiver: J
-            5 $i$a$1$block: I
+            5 $i$a$-block-InlineReceiversKt$foo$1: I
             6 $i$f$block: I
             2 x: Z
             0 $receiver: Ljava/lang/String;