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

Assertion remove fix

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-01-29 17:06:52 +04:00
parent 074cebdaa6
commit 0ac53da2ed
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/asm/MethodInliner.java
+17 -4
View File
@@ -371,10 +371,23 @@ public class MethodInliner {
MethodInsnNode methodInsnNode = (MethodInsnNode) next; MethodInsnNode methodInsnNode = (MethodInsnNode) next;
if (methodInsnNode.name.equals("checkParameterIsNotNull") && methodInsnNode.owner.equals("jet/runtime/Intrinsics")) { if (methodInsnNode.name.equals("checkParameterIsNotNull") && methodInsnNode.owner.equals("jet/runtime/Intrinsics")) {
AbstractInsnNode prev = cur.getPrevious(); AbstractInsnNode prev = cur.getPrevious();
assert prev.getType() == AbstractInsnNode.VAR_INSN && prev.getOpcode() == Opcodes.ALOAD; boolean delete = false;
int varIndex = ((VarInsnNode) prev).var; if (prev.getOpcode() == Opcodes.INVOKESTATIC) {
LambdaInfo closure = getLambda(varIndex); //parameter boxing
if (closure != null) { AbstractInsnNode prePrevious = cur.getPrevious();
if (prePrevious.getType() == AbstractInsnNode.VAR_INSN &&
prePrevious.getOpcode() < Opcodes.ALOAD &&
prePrevious.getOpcode() >= Opcodes.ILOAD) {
delete = true;
node.instructions.remove(prePrevious);
}
} else {
assert prev.getType() == AbstractInsnNode.VAR_INSN && prev.getOpcode() == Opcodes.ALOAD;
int varIndex = ((VarInsnNode) prev).var;
LambdaInfo closure = getLambda(varIndex);
delete = closure != null;
}
if (delete) {
node.instructions.remove(prev); node.instructions.remove(prev);
node.instructions.remove(cur); node.instructions.remove(cur);
cur = next.getNext(); cur = next.getNext();