azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix backend tests after changing format of synthetic variables for inline functions

Browse Source
This commit is contained in:
Yan Zhulanow
2018-12-03 13:56:31 +09:00
parent e6643ef2b7
commit dd49d35320
10 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt
Vendored
+1 -1
View File
@@ -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_y_param TYPE=LA; INDEX=5
// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=6 // VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=6
// VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=7 // 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=a$iv TYPE=LA; INDEX=1
// VARIABLE : NAME=$i$f$foo TYPE=I INDEX=8 // VARIABLE : NAME=$i$f$foo TYPE=I INDEX=8
compiler/testData/checkLocalVariablesTable/destructuringInlineLambda.kt
Vendored
+1 -1
View File
@@ -19,5 +19,5 @@ fun box(): String {
// VARIABLE : NAME=a1 TYPE=Ljava/lang/String; INDEX=2 // VARIABLE : NAME=a1 TYPE=Ljava/lang/String; INDEX=2
// VARIABLE : NAME=a2 TYPE=Ljava/lang/String; INDEX=3 // VARIABLE : NAME=a2 TYPE=Ljava/lang/String; INDEX=3
// VARIABLE : NAME=a3 TYPE=I INDEX=4 // 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 // VARIABLE : NAME=$i$f$foo TYPE=I INDEX=6
compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ class A {
// METHOD : A.foo()V // METHOD : A.foo()V
// VARIABLE : NAME=zzz TYPE=I INDEX=3 // VARIABLE : NAME=zzz TYPE=I INDEX=3
// VARIABLE : NAME=it TYPE=I INDEX=2 // 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=this_$iv TYPE=LA; INDEX=1
// VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=5 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=5
// VARIABLE : NAME=this TYPE=LA; INDEX=0 // VARIABLE : NAME=this TYPE=LA; INDEX=0
compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt
Vendored
+2 -2
View File
@@ -16,10 +16,10 @@ class A {
// METHOD : A.foo()V // METHOD : A.foo()V
// VARIABLE : NAME=zzz TYPE=I INDEX=4 // VARIABLE : NAME=zzz TYPE=I INDEX=4
// VARIABLE : NAME=l TYPE=I INDEX=3 // 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=zzz TYPE=I INDEX=4
// VARIABLE : NAME=l TYPE=I INDEX=3 // 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=this_$iv TYPE=LA; INDEX=1
// VARIABLE : NAME=p$iv TYPE=I INDEX=2 // VARIABLE : NAME=p$iv TYPE=I INDEX=2
// VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=6 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=6
compiler/testData/checkLocalVariablesTable/inlineSimple.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ class A {
// METHOD : A.foo()V // METHOD : A.foo()V
// VARIABLE : NAME=zzz TYPE=I INDEX=3 // 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=this_$iv TYPE=LA; INDEX=2
// VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=5 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=5
// VARIABLE : NAME=s TYPE=I INDEX=1 // VARIABLE : NAME=s TYPE=I INDEX=1
compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt
Vendored
+2 -2
View File
@@ -19,11 +19,11 @@ class A {
// METHOD : A.foo()V // METHOD : A.foo()V
// VARIABLE : NAME=zz2 TYPE=I INDEX=5 // 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=this_$iv TYPE=LA; INDEX=4
// VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=7 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=7
// VARIABLE : NAME=z TYPE=I INDEX=3 // 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=this_$iv TYPE=LA; INDEX=2
// VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=9 // VARIABLE : NAME=$i$f$inlineFun TYPE=I INDEX=9
// VARIABLE : NAME=s TYPE=I INDEX=1 // VARIABLE : NAME=s TYPE=I INDEX=1
compiler/testData/codegen/asmLike/receiverMangling/deepInline.txt
Vendored
+4 -4
View File
@@ -5,18 +5,18 @@ public final class DeepInlineKt : java/lang/Object {
1 $i$f$block: I 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: Local variables:
9 $receiver: J 9 $receiver: J
11 $i$a$1$block: I 11 $i$a$-block-DeepInlineKt$foo$1$1$1: I
12 $i$f$block: I 12 $i$f$block: I
8 z: Z 8 z: Z
6 $receiver: J 6 $receiver: J
13 $i$a$1$block: I 13 $i$a$-block-DeepInlineKt$foo$1$1: I
14 $i$f$block: I 14 $i$f$block: I
5 y: Z 5 y: Z
3 $receiver: J 3 $receiver: J
15 $i$a$1$block: I 15 $i$a$-block-DeepInlineKt$foo$1: I
16 $i$f$block: I 16 $i$f$block: I
2 x: Z 2 x: Z
0 $receiver: Ljava/lang/String; 0 $receiver: Ljava/lang/String;
compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.txt
Vendored
+4 -4
View File
@@ -5,18 +5,18 @@ public final class DeepInlineWithLabelsKt : java/lang/Object {
1 $i$f$block: I 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: Local variables:
9 $receiver: J 9 $receiver: J
11 $i$a$1$block: I 11 $i$a$-block-DeepInlineWithLabelsKt$foo$1$1$1: I
12 $i$f$block: I 12 $i$f$block: I
8 z: Z 8 z: Z
6 $receiver: J 6 $receiver: J
13 $i$a$1$block: I 13 $i$a$-block-DeepInlineWithLabelsKt$foo$1$1: I
14 $i$f$block: I 14 $i$f$block: I
5 y: Z 5 y: Z
3 $receiver: J 3 $receiver: J
15 $i$a$1$block: I 15 $i$a$-block-DeepInlineWithLabelsKt$foo$1: I
16 $i$f$block: I 16 $i$f$block: I
2 x: Z 2 x: Z
0 $receiver: Ljava/lang/String; 0 $receiver: Ljava/lang/String;
compiler/testData/codegen/asmLike/receiverMangling/inlineClassCapture.txt
Vendored
+3 -3
View File
@@ -9,9 +9,9 @@ public final class Foo$Bar : java/lang/Object {
public final void bar() { public final void bar() {
Local variables: Local variables:
1 $i$a$1$block: I 1 $i$a$-block-Foo$Bar$bar$1$1: I
2 $i$f$block: 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 4 $i$f$block: I
0 this: LFoo$Bar; 0 this: LFoo$Bar;
} }
@@ -25,7 +25,7 @@ public final class Foo : java/lang/Object {
public final void foo() { public final void foo() {
Local variables: Local variables:
1 $i$a$1$block: I 1 $i$a$-block-Foo$foo$1: I
2 $i$f$block: I 2 $i$f$block: I
0 this: LFoo; 0 this: LFoo;
} }
compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.txt
Vendored
+2 -2
View File
@@ -5,10 +5,10 @@ public final class InlineReceiversKt : java/lang/Object {
1 $i$f$block: I 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: Local variables:
3 $receiver: J 3 $receiver: J
5 $i$a$1$block: I 5 $i$a$-block-InlineReceiversKt$foo$1: I
6 $i$f$block: I 6 $i$f$block: I
2 x: Z 2 x: Z
0 $receiver: Ljava/lang/String; 0 $receiver: Ljava/lang/String;