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

Minor. Invert if

Browse Source
This commit is contained in:
Denis Zharkov
2016-10-07 18:59:58 +03:00
parent 0905bf3e38
commit b1dc31a64e
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/OptimizationBasicInterpreter.java
+2 -4
View File
@@ -86,7 +86,8 @@ public class OptimizationBasicInterpreter extends BasicInterpreter {
public BasicValue merge( public BasicValue merge(
@NotNull BasicValue v, @NotNull BasicValue w @NotNull BasicValue v, @NotNull BasicValue w
) { ) {
if (!v.equals(w)) { if (v.equals(w)) return v;
if (v == BasicValue.UNINITIALIZED_VALUE || w == BasicValue.UNINITIALIZED_VALUE) { if (v == BasicValue.UNINITIALIZED_VALUE || w == BasicValue.UNINITIALIZED_VALUE) {
return BasicValue.UNINITIALIZED_VALUE; return BasicValue.UNINITIALIZED_VALUE;
} }
@@ -106,9 +107,6 @@ public class OptimizationBasicInterpreter extends BasicInterpreter {
return BasicValue.UNINITIALIZED_VALUE; return BasicValue.UNINITIALIZED_VALUE;
} }
return v;
}
private static boolean isReference(@NotNull BasicValue v) { private static boolean isReference(@NotNull BasicValue v) {
return v.getType().getSort() == Type.OBJECT || v.getType().getSort() == Type.ARRAY; return v.getType().getSort() == Type.OBJECT || v.getType().getSort() == Type.ARRAY;
} }