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) { else if (fromType.getSort() == Type.OBJECT && toType.getSort() <= Type.DOUBLE) {
if (fromType.equals(OBJECT_TYPE)) { if (toType.getSort() == Type.BOOLEAN) {
if (toType.getSort() == Type.BOOLEAN) { coerce(fromType, JvmPrimitiveType.BOOLEAN.getWrapper().getAsmType(), v);
v.checkcast(JvmPrimitiveType.BOOLEAN.getWrapper().getAsmType()); }
} else if (toType.getSort() == Type.CHAR) {
else if (toType.getSort() == Type.CHAR) { coerce(fromType, JvmPrimitiveType.CHAR.getWrapper().getAsmType(), v);
v.checkcast(JvmPrimitiveType.CHAR.getWrapper().getAsmType()); }
} else {
else { coerce(fromType, getType(Number.class), v);
v.checkcast(getType(Number.class));
}
} }
unbox(toType, v); unbox(toType, v);
} }
compiler/testData/codegen/primitiveTypes/unboxComparable.kt
+5
View File
@@ -0,0 +1,5 @@
fun foo(x: Int) = x
fun bar(x: Comparable<Int>) = if (x is Int) foo(x) else 0
fun box() = if (bar(42) == 42) "OK" else "Fail"
compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
+4
View File
@@ -456,4 +456,8 @@ public class PrimitiveTypesTest extends CodegenTestCase {
public void test2794() throws Exception { public void test2794() throws Exception {
blackBoxFile("regressions/kt2794.kt"); blackBoxFile("regressions/kt2794.kt");
} }
public void testUnboxComparable() {
blackBoxFile("primitiveTypes/unboxComparable.kt");
}
} }