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

Merge conditions refinement

Browse Source
This commit is contained in:
Denis Zharkov
2014-07-10 18:14:15 +04:00
committed by Alexander Udalov
parent 0f5e29df9b
commit 602e60f72e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/BoxingInterpreter.java
+10 -2
View File
@@ -211,12 +211,20 @@ public class BoxingInterpreter extends OptimizationBasicInterpreter {
return v; return v;
} }
if (v instanceof BoxedBasicValue && w != BasicValue.UNINITIALIZED_VALUE) { if (v instanceof BoxedBasicValue && w == BasicValue.UNINITIALIZED_VALUE) {
return v;
}
if (w instanceof BoxedBasicValue && v == BasicValue.UNINITIALIZED_VALUE) {
return w;
}
if (v instanceof BoxedBasicValue) {
onMergeFail((BoxedBasicValue) v); onMergeFail((BoxedBasicValue) v);
v = new BasicValue(v.getType()); v = new BasicValue(v.getType());
} }
if (w instanceof BoxedBasicValue && v != BasicValue.UNINITIALIZED_VALUE) { if (w instanceof BoxedBasicValue) {
onMergeFail((BoxedBasicValue) w); onMergeFail((BoxedBasicValue) w);
w = new BasicValue(w.getType()); w = new BasicValue(w.getType());
} }