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

remapping to facades

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-02-17 16:00:34 +04:00
parent 3f9125cf08
commit c716b6eda0
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/asm/MethodInliner.java
+15 -9
View File
@@ -135,12 +135,6 @@ public class MethodInliner {
} }
} }
////for local function support
//@Override
//public void checkcast(Type type) {
// super.checkcast(changeOwnerIfLocalFun(type));
//}
@Override @Override
public void visitMethodInsn(int opcode, String owner, String name, String desc) { public void visitMethodInsn(int opcode, String owner, String name, String desc) {
if (/*INLINE_RUNTIME.equals(owner) &&*/ isInvokeOnInlinable(owner, name)) { //TODO add method if (/*INLINE_RUNTIME.equals(owner) &&*/ isInvokeOnInlinable(owner, name)) { //TODO add method
@@ -164,7 +158,7 @@ public class MethodInliner {
this.setInlining(true); this.setInlining(true);
MethodInliner inliner = new MethodInliner(info.getNode(), params, parent.subInline(parent.nameGenerator.subGenerator("lambda")), info.getLambdaClassType(), MethodInliner inliner = new MethodInliner(info.getNode(), params, parent.subInline(parent.nameGenerator.subGenerator("lambda")), info.getLambdaClassType(),
capturedRemapper, isSameModule); capturedRemapper, true /*cause all call in same module as lambda*/);
VarRemapper.ParamRemapper remapper = new VarRemapper.ParamRemapper(params, valueParamShift); VarRemapper.ParamRemapper remapper = new VarRemapper.ParamRemapper(params, valueParamShift);
inliner.doTransformAndMerge(this.mv, remapper); //TODO add skipped this and receiver inliner.doTransformAndMerge(this.mv, remapper); //TODO add skipped this and receiver
@@ -193,11 +187,11 @@ public class MethodInliner {
super.visitMethodInsn(opcode, invocation.getNewLambdaType().getInternalName(), name, invocation.getNewConstructorDescriptor()); super.visitMethodInsn(opcode, invocation.getNewLambdaType().getInternalName(), name, invocation.getNewConstructorDescriptor());
invocation = null; invocation = null;
} else { } else {
super.visitMethodInsn(opcode, owner, name, desc); super.visitMethodInsn(opcode, changeOwnerForExternalPackage(owner, opcode), name, desc);
} }
} }
else { else {
super.visitMethodInsn(opcode, /*changeOwnerIfLocalFun(*/owner/*)*/, name, desc); super.visitMethodInsn(opcode, changeOwnerForExternalPackage(owner, opcode), name, desc);
} }
} }
}; };
@@ -531,4 +525,16 @@ public class MethodInliner {
mv.visitVarInsn(next.getOpcode(Opcodes.ISTORE), shift); mv.visitVarInsn(next.getOpcode(Opcodes.ISTORE), shift);
} }
} }
public String changeOwnerForExternalPackage(String type, int opcode) {
if (isSameModule || (opcode & Opcodes.INVOKESTATIC) == 0) {
return type;
}
int i = type.indexOf('-');
if (i >= 0) {
return type.substring(0, i);
}
return type;
}
} }