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

Support for IFNONNULL opcode in RedundantNullCheckMethodTransformer

Browse Source
This commit is contained in:
Denis Zharkov
2014-07-07 21:05:35 +04:00
committed by Alexander Udalov
parent b1a54a424e
commit 779e2a096e
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantNullCheckMethodTransformer.java
+14 -6
View File
@@ -19,10 +19,7 @@ package org.jetbrains.jet.codegen.optimization.boxing;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.codegen.optimization.transformer.MethodTransformer; import org.jetbrains.jet.codegen.optimization.transformer.MethodTransformer;
import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Opcodes;
import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode; import org.jetbrains.org.objectweb.asm.tree.*;
import org.jetbrains.org.objectweb.asm.tree.InsnList;
import org.jetbrains.org.objectweb.asm.tree.InsnNode;
import org.jetbrains.org.objectweb.asm.tree.MethodNode;
import org.jetbrains.org.objectweb.asm.tree.analysis.Analyzer; import org.jetbrains.org.objectweb.asm.tree.analysis.Analyzer;
import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue; import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue;
import org.jetbrains.org.objectweb.asm.tree.analysis.Frame; import org.jetbrains.org.objectweb.asm.tree.analysis.Frame;
@@ -60,7 +57,7 @@ public class RedundantNullCheckMethodTransformer extends MethodTransformer {
Frame<BasicValue> frame = frames[i]; Frame<BasicValue> frame = frames[i];
AbstractInsnNode insn = insnList.get(i); AbstractInsnNode insn = insnList.get(i);
if (insn.getOpcode() == Opcodes.IFNULL && if ((insn.getOpcode() == Opcodes.IFNULL || insn.getOpcode() == Opcodes.IFNONNULL) &&
frame.getStack(frame.getStackSize() - 1) instanceof BoxedBasicValue) { frame.getStack(frame.getStackSize() - 1) instanceof BoxedBasicValue) {
insnsToOptimize.add(insn); insnsToOptimize.add(insn);
@@ -75,7 +72,18 @@ public class RedundantNullCheckMethodTransformer extends MethodTransformer {
insnList.insertBefore(insn, new InsnNode(Opcodes.POP)); insnList.insertBefore(insn, new InsnNode(Opcodes.POP));
} }
insnList.remove(insn); assert insn.getOpcode() == Opcodes.IFNULL
|| insn.getOpcode() == Opcodes.IFNONNULL : "only IFNULL/IFNONNULL are supported";
if (insn.getOpcode() == Opcodes.IFNULL) {
insnList.remove(insn);
}
else {
insnList.set(
insn,
new JumpInsnNode(Opcodes.GOTO, ((JumpInsnNode) insn).label)
);
}
} }
return insnsToOptimize.size() > 0; return insnsToOptimize.size() > 0;