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

Generate local var table

Browse Source
This commit is contained in:
Michael Bogdanov
2015-03-23 17:22:00 +03:00
parent 5c0a81fae1
commit 8cd496556c
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
+1 -1
View File
@@ -63,7 +63,7 @@ import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.isTrait; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isTrait;
public class InlineCodegenUtil { public class InlineCodegenUtil {
public static final boolean GENERATE_SMAP = false; public static final boolean GENERATE_SMAP = true;
public static final int API = Opcodes.ASM5; public static final int API = Opcodes.ASM5;
public static final String INVOKE = "invoke"; public static final String INVOKE = "invoke";
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java
+7 -2
View File
@@ -97,9 +97,14 @@ public class LocalVarRemapper {
public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index, MethodVisitor mv) { public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index, MethodVisitor mv) {
RemapInfo info = doRemap(index); RemapInfo info = doRemap(index);
//add entries only for shifted vars
if (SHIFT == info.status) { if (SHIFT == info.status) {
//add entries only for shifted vars int newIndex = ((StackValue.Local) info.value).index;
mv.visitLocalVariable(name, desc, signature, start, end, ((StackValue.Local) info.value).index); if (newIndex != 0 && "this".equals(name)) {
/*skip additional this for now*/
return;
}
mv.visitLocalVariable(name, desc, signature, start, end, newIndex);
} }
} }
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
+1 -1
View File
@@ -340,7 +340,7 @@ public class MethodInliner {
public void visitLocalVariable( public void visitLocalVariable(
@NotNull String name, @NotNull String desc, String signature, @NotNull Label start, @NotNull Label end, int index @NotNull String name, @NotNull String desc, String signature, @NotNull Label start, @NotNull Label end, int index
) { ) {
if (isInliningLambda) { if (isInliningLambda || InlineCodegenUtil.GENERATE_SMAP) {
super.visitLocalVariable(name, desc, signature, start, end, getNewIndex(index)); super.visitLocalVariable(name, desc, signature, start, end, getNewIndex(index));
} }
} }
compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt
+1
View File
@@ -17,4 +17,5 @@ class A {
// VARIABLE : NAME=l TYPE=I INDEX=3 // VARIABLE : NAME=l TYPE=I INDEX=3
// 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=p TYPE=I INDEX=2
// VARIABLE : NAME=this TYPE=LA; INDEX=0 // VARIABLE : NAME=this TYPE=LA; INDEX=0