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

KT-2457 Verify error when comparing not null value with null in when

Browse Source 
backend-side changes
This commit is contained in:
Alexander Udalov
2012-07-20 14:40:30 +04:00
parent fa7ad96a4e
commit 2ac70ee35f
4 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+5 -1
View File
@@ -2848,7 +2848,7 @@ The "returned" value of try expression with no finally is either the last expres
}
else if (pattern instanceof JetExpressionPattern) {
if (expressionToMatch != null) {
final Type subjectType = expressionToMatch.type;
Type subjectType = expressionToMatch.type;
expressionToMatch.dupReceiver(v);
expressionToMatch.put(subjectType, v);
JetExpression condExpression = ((JetExpressionPattern) pattern).getExpression();
@@ -2857,6 +2857,10 @@ The "returned" value of try expression with no finally is either the last expres
Type condType;
if (isNumberPrimitive(subjectType) || subjectType.getSort() == Type.BOOLEAN) {
condType = asmType(condJetType);
if (!(isNumberPrimitive(condType) || condType.getSort() == Type.BOOLEAN)) {
subjectType = JetTypeMapper.boxType(subjectType);
expressionToMatch.coerce(subjectType, v);
}
}
else {
condType = TYPE_OBJECT;