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

Refactor StackValue.coerce()

Browse Source
This commit is contained in:
Alexander Udalov
2012-11-26 18:24:24 +04:00
parent 9eecf22e15
commit 0c5960922a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
+9 -7
View File
@@ -235,10 +235,10 @@ public abstract class StackValue {
public static void coerce(Type fromType, Type toType, InstructionAdapter v) { public static void coerce(Type fromType, Type toType, InstructionAdapter v) {
if (toType.equals(fromType)) return; if (toType.equals(fromType)) return;
if (toType.getSort() == Type.VOID && fromType.getSort() != Type.VOID) { if (toType.getSort() == Type.VOID) {
pop(fromType, v); pop(fromType, v);
} }
else if (toType.getSort() != Type.VOID && fromType.getSort() == Type.VOID) { else if (fromType.getSort() == Type.VOID) {
if (toType.getSort() == Type.OBJECT) { if (toType.getSort() == Type.OBJECT) {
putTuple0Instance(v); putTuple0Instance(v);
} }
@@ -255,22 +255,24 @@ public abstract class StackValue {
v.iconst(0); v.iconst(0);
} }
} }
else if (toType.equals(JET_TUPLE0_TYPE) && !fromType.equals(JET_TUPLE0_TYPE)) { else if (toType.equals(JET_TUPLE0_TYPE)) {
pop(fromType, v); pop(fromType, v);
putTuple0Instance(v); putTuple0Instance(v);
} }
else if (toType.getSort() == Type.OBJECT && fromType.equals(OBJECT_TYPE) || toType.getSort() == Type.ARRAY) { else if (toType.getSort() == Type.ARRAY) {
v.checkcast(toType); v.checkcast(toType);
} }
else if (toType.getSort() == Type.OBJECT) { else if (toType.getSort() == Type.OBJECT) {
if (fromType.getSort() == Type.OBJECT && !toType.equals(OBJECT_TYPE)) { if (fromType.getSort() == Type.OBJECT || fromType.getSort() == Type.ARRAY) {
v.checkcast(toType); if (!toType.equals(OBJECT_TYPE)) {
v.checkcast(toType);
}
} }
else { else {
box(fromType, toType, v); box(fromType, toType, v);
} }
} }
else if (fromType.getSort() == Type.OBJECT && toType.getSort() <= Type.DOUBLE) { else if (fromType.getSort() == Type.OBJECT) {
if (toType.getSort() == Type.BOOLEAN) { if (toType.getSort() == Type.BOOLEAN) {
coerce(fromType, JvmPrimitiveType.BOOLEAN.getWrapper().getAsmType(), v); coerce(fromType, JvmPrimitiveType.BOOLEAN.getWrapper().getAsmType(), v);
} }