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

Do not remove boxing when possibly unsuccessful CHECKCAST is performed

Browse Source
This commit is contained in:
Denis Zharkov
2014-07-09 11:52:54 +04:00
committed by Alexander Udalov
parent 779e2a096e
commit 270e58cf4e
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxingInterpreter.java
+19
View File
@@ -100,11 +100,30 @@ class RedundantBoxingInterpreter extends BoxingInterpreter {
@NotNull AbstractInsnNode insn, @NotNull BasicValue value @NotNull AbstractInsnNode insn, @NotNull BasicValue value
) throws AnalyzerException { ) throws AnalyzerException {
if (insn.getOpcode() == Opcodes.CHECKCAST && value instanceof BoxedBasicValue) {
TypeInsnNode typeInsn = (TypeInsnNode) insn;
if (!isSafeCast((BoxedBasicValue) value, typeInsn.desc)) {
markValueAsDirty((BoxedBasicValue) value);
}
}
processOperationWithBoxedValue(value, insn); processOperationWithBoxedValue(value, insn);
return super.unaryOperation(insn, value); return super.unaryOperation(insn, value);
} }
private static boolean isSafeCast(@NotNull BoxedBasicValue value, @NotNull String descTo) {
try {
return Class.forName(Type.getObjectType(descTo).getClassName()).isAssignableFrom(
Class.forName(value.getType().getClassName())
);
}
catch (ClassNotFoundException e) {
return false;
}
}
@Override @Override
@NotNull @NotNull
public BasicValue copyOperation(@NotNull AbstractInsnNode insn, @NotNull BasicValue value) throws AnalyzerException { public BasicValue copyOperation(@NotNull AbstractInsnNode insn, @NotNull BasicValue value) throws AnalyzerException {