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

KT-711 primitive value in left side of elvis operator

Browse Source
This commit is contained in:
Alex Tkachman
2011-12-03 18:22:18 +02:00
parent cd635121ea
commit d33d1367de
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+6
View File
@@ -1693,6 +1693,12 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
final Type exprType = expressionType(expression); final Type exprType = expressionType(expression);
final Type leftType = expressionType(expression.getLeft()); final Type leftType = expressionType(expression.getLeft());
gen(expression.getLeft(), leftType); gen(expression.getLeft(), leftType);
if(leftType.getSort() != Type.OBJECT && leftType.getSort() != Type.ARRAY) {
if(leftType != exprType) {
StackValue.onStack(leftType).put(exprType, v);
}
return StackValue.onStack(exprType);
}
v.dup(); v.dup();
Label end = new Label(); Label end = new Label();
Label ifNull = new Label(); Label ifNull = new Label();
compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
+6
View File
@@ -285,6 +285,12 @@ public class PrimitiveTypesTest extends CodegenTestCase {
blackBoxFile("regressions/kt518.jet"); blackBoxFile("regressions/kt518.jet");
} }
public void testKt711 () throws Exception {
loadText("fun box() = if ((1 ?: 0) == 1) \"OK\" else \"fail\"");
// System.out.println(generateToText());
blackBox();
}
public void testKt665() throws Exception { public void testKt665() throws Exception {
loadText("fun f(x: Long, zzz: Long = 1): Long\n" + loadText("fun f(x: Long, zzz: Long = 1): Long\n" +
"{\n" + "{\n" +