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

Rename local variable for this in inline function

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-11-30 15:19:26 +03:00
parent a932315bf9
commit a1f3c5381e
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
+2 -1
View File
@@ -354,7 +354,8 @@ public class MethodInliner {
) {
if (isInliningLambda || InlineCodegenUtil.GENERATE_SMAP) {
String varSuffix = inliningContext.isRoot() && !InlineCodegenUtil.isFakeLocalVariableForInline(name) ? INLINE_FUN_VAR_SUFFIX : "";
super.visitLocalVariable(name + varSuffix, desc, signature, start, end, getNewIndex(index));
String varName = !varSuffix.isEmpty() && name.equals("this") ? name + "_" : name;
super.visitLocalVariable(varName + varSuffix, desc, signature, start, end, getNewIndex(index));
}
}
};
compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt
Vendored
+1 -1
View File
@@ -15,6 +15,6 @@ class A {
// VARIABLE : NAME=zzz TYPE=I INDEX=3
// VARIABLE : NAME=it TYPE=I INDEX=2
// VARIABLE : NAME=$i$a$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=this TYPE=LA; INDEX=0
compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ class A {
// VARIABLE : NAME=zzz TYPE=I INDEX=4
// VARIABLE : NAME=l TYPE=I INDEX=3
// VARIABLE : NAME=$i$a$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=$i$f$inlineFun TYPE=I INDEX=6
// VARIABLE : NAME=this TYPE=LA; INDEX=0
compiler/testData/checkLocalVariablesTable/inlineSimple.kt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ class A {
// METHOD : A.foo()V
// VARIABLE : NAME=zzz TYPE=I INDEX=3
// VARIABLE : NAME=$i$a$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=s TYPE=I INDEX=1
// VARIABLE : NAME=this TYPE=LA; INDEX=0
compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt
Vendored
+2 -2
View File
@@ -20,11 +20,11 @@ class A {
// METHOD : A.foo()V
// VARIABLE : NAME=zz2 TYPE=I INDEX=5
// VARIABLE : NAME=$i$a$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=z TYPE=I INDEX=3
// VARIABLE : NAME=$i$a$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=s TYPE=I INDEX=1
// VARIABLE : NAME=this TYPE=LA; INDEX=0