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

Coerce any type to Number before unboxing

Browse Source
This commit is contained in:
Alexander Udalov
2012-10-26 18:03:40 +04:00
parent 627c3cf42e
commit 4cfe68da1e
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
+8 -10
View File
@@ -294,16 +294,14 @@ public abstract class StackValue {
}
}
else if (fromType.getSort() == Type.OBJECT && toType.getSort() <= Type.DOUBLE) {
if (fromType.equals(OBJECT_TYPE)) {
if (toType.getSort() == Type.BOOLEAN) {
v.checkcast(JvmPrimitiveType.BOOLEAN.getWrapper().getAsmType());
}
else if (toType.getSort() == Type.CHAR) {
v.checkcast(JvmPrimitiveType.CHAR.getWrapper().getAsmType());
}
else {
v.checkcast(getType(Number.class));
}
if (toType.getSort() == Type.BOOLEAN) {
coerce(fromType, JvmPrimitiveType.BOOLEAN.getWrapper().getAsmType(), v);
}
else if (toType.getSort() == Type.CHAR) {
coerce(fromType, JvmPrimitiveType.CHAR.getWrapper().getAsmType(), v);
}
else {
coerce(fromType, getType(Number.class), v);
}
unbox(toType, v);
}