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

Support new convention for local variables name mangling: '$receiver' -> '$this$<label>' (KT-26913)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-12-06 15:38:56 +09:00
parent b5f9149702
commit ea462091c4
23 changed files with 100 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/asmLike/receiverMangling/deepInline.txt
Vendored
+5 -5
View File
@@ -5,21 +5,21 @@ public final class DeepInlineKt : java/lang/Object {
1 $i$f$block: I
}
public final static void foo(java.lang.String $receiver, int $i$a$-block-DeepInlineKt$foo$1$1$1) {
public final static void foo(java.lang.String $this$block, int $i$a$-block-DeepInlineKt$foo$1$1$1) {
Local variables:
14 $receiver: J
14 $this$block: J
16 $i$a$-block-DeepInlineKt$foo$1$1$1: I
13 $i$f$block: I
12 z: Z
9 $receiver: J
9 $this$block: J
11 $i$a$-block-DeepInlineKt$foo$1$1: I
8 $i$f$block: I
7 y: Z
4 $receiver: J
4 $this$block: J
6 $i$a$-block-DeepInlineKt$foo$1: I
3 $i$f$block: I
2 x: Z
0 $receiver: Ljava/lang/String;
0 $this$foo: Ljava/lang/String;
1 count: I
}
}
compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.txt
Vendored
+5 -5
View File
@@ -5,21 +5,21 @@ public final class DeepInlineWithLabelsKt : java/lang/Object {
1 $i$f$block: I
}
public final static void foo(java.lang.String $receiver, int $i$a$-block-DeepInlineWithLabelsKt$foo$1$1$1) {
public final static void foo(java.lang.String $this$b3, int $i$a$-block-DeepInlineWithLabelsKt$foo$1$1$1) {
Local variables:
14 $receiver: J
14 $this$b3: J
16 $i$a$-block-DeepInlineWithLabelsKt$foo$1$1$1: I
13 $i$f$block: I
12 z: Z
9 $receiver: J
9 $this$b2: J
11 $i$a$-block-DeepInlineWithLabelsKt$foo$1$1: I
8 $i$f$block: I
7 y: Z
4 $receiver: J
4 $this$b1: J
6 $i$a$-block-DeepInlineWithLabelsKt$foo$1: I
3 $i$f$block: I
2 x: Z
0 $receiver: Ljava/lang/String;
0 $this$foo: Ljava/lang/String;
1 count: I
}
}
compiler/testData/codegen/asmLike/receiverMangling/deepNoinlineWithLabels_after.txt
Vendored
+6 -6
View File
@@ -9,10 +9,10 @@ final class DeepNoinlineWithLabels_afterKt$foo$1$1$1 : kotlin/jvm/internal/Lambd
public java.lang.Object invoke(java.lang.Object p0)
public final void invoke(long $receiver) {
public final void invoke(long $this$b3) {
Local variables:
0 this: LDeepNoinlineWithLabels_afterKt$foo$1$1$1;
1 $receiver: J
1 $this$b3: J
}
}
@@ -31,7 +31,7 @@ final class DeepNoinlineWithLabels_afterKt$foo$1$1 : kotlin/jvm/internal/Lambda,
Local variables:
3 z: Z
0 this: LDeepNoinlineWithLabels_afterKt$foo$1$1;
1 $receiver: J
1 $this$b2: J
}
}
@@ -50,7 +50,7 @@ final class DeepNoinlineWithLabels_afterKt$foo$1 : kotlin/jvm/internal/Lambda, k
Local variables:
3 y: Z
0 this: LDeepNoinlineWithLabels_afterKt$foo$1;
1 $receiver: J
1 $this$b1: J
}
}
@@ -60,10 +60,10 @@ public final class DeepNoinlineWithLabels_afterKt : java/lang/Object {
0 block: Lkotlin/jvm/functions/Function1;
}
public final static void foo(java.lang.String x, int $receiver) {
public final static void foo(java.lang.String x, int $this$foo) {
Local variables:
2 x: Z
0 $receiver: Ljava/lang/String;
0 $this$foo: Ljava/lang/String;
1 count: I
}
}
compiler/testData/codegen/asmLike/receiverMangling/deepNoinline_after.txt
Vendored
+6 -6
View File
@@ -7,10 +7,10 @@ final class DeepNoinline_afterKt$foo$1$1$1 : kotlin/jvm/internal/Lambda, kotlin/
public java.lang.Object invoke(java.lang.Object p0)
public final void invoke(long $receiver) {
public final void invoke(long $this$block) {
Local variables:
0 this: LDeepNoinline_afterKt$foo$1$1$1;
1 $receiver: J
1 $this$block: J
}
}
@@ -27,7 +27,7 @@ final class DeepNoinline_afterKt$foo$1$1 : kotlin/jvm/internal/Lambda, kotlin/jv
Local variables:
3 z: Z
0 this: LDeepNoinline_afterKt$foo$1$1;
1 $receiver: J
1 $this$block: J
}
}
@@ -46,7 +46,7 @@ final class DeepNoinline_afterKt$foo$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/
Local variables:
3 y: Z
0 this: LDeepNoinline_afterKt$foo$1;
1 $receiver: J
1 $this$block: J
}
}
@@ -56,10 +56,10 @@ public final class DeepNoinline_afterKt : java/lang/Object {
0 block: Lkotlin/jvm/functions/Function1;
}
public final static void foo(java.lang.String x, int $receiver) {
public final static void foo(java.lang.String x, int $this$foo) {
Local variables:
2 x: Z
0 $receiver: Ljava/lang/String;
0 $this$foo: Ljava/lang/String;
1 count: I
}
}
compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.txt
Vendored
+3 -3
View File
@@ -5,13 +5,13 @@ public final class InlineReceiversKt : java/lang/Object {
1 $i$f$block: I
}
public final static void foo(java.lang.String $receiver, int $i$a$-block-InlineReceiversKt$foo$1) {
public final static void foo(java.lang.String $this$block, int $i$a$-block-InlineReceiversKt$foo$1) {
Local variables:
4 $receiver: J
4 $this$block: J
6 $i$a$-block-InlineReceiversKt$foo$1: I
3 $i$f$block: I
2 x: Z
0 $receiver: Ljava/lang/String;
0 $this$foo: Ljava/lang/String;
1 count: I
}
}
compiler/testData/codegen/asmLike/receiverMangling/nonInlineReceivers_after.txt
Vendored
+4 -4
View File
@@ -9,10 +9,10 @@ final class NonInlineReceivers_afterKt$foo$1 : kotlin/jvm/internal/Lambda, kotli
public java.lang.Object invoke(java.lang.Object p0)
public final void invoke(long $receiver) {
public final void invoke(long $this$block) {
Local variables:
0 this: LNonInlineReceivers_afterKt$foo$1;
1 $receiver: J
1 $this$block: J
}
}
@@ -22,10 +22,10 @@ public final class NonInlineReceivers_afterKt : java/lang/Object {
0 block: Lkotlin/jvm/functions/Function1;
}
public final static void foo(java.lang.String x, int $receiver) {
public final static void foo(java.lang.String x, int $this$foo) {
Local variables:
2 x: Z
0 $receiver: Ljava/lang/String;
0 $this$foo: Ljava/lang/String;
1 count: I
}
}
compiler/testData/codegen/asmLike/receiverMangling/simple.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
public final class SimpleKt : java/lang/Object {
public final static void foo(java.lang.String $receiver, int a)
public final static void foo(java.lang.String $this$foo, int a)
}