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

Fix for 'if' special construct type

Browse Source 
If one branch has Nothing type (contains 'return', etc.),
return result type of corresponding resolved call (it may depend on smart casts)
 #KT-6242 Fixed
This commit is contained in:
Svetlana Isakova
2014-11-13 15:54:02 +03:00
parent 36fd8a1a08
commit 5d0f004292
5 changed files with 91 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java
+7 -6
View File
@@ -133,21 +133,22 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
boolean jumpInThen = thenType != null && KotlinBuiltIns.getInstance().isNothing(thenType);
boolean jumpInElse = elseType != null && KotlinBuiltIns.getInstance().isNothing(elseType);
JetTypeInfo result;
DataFlowInfo resultDataFlowInfo;
if (thenType == null && elseType == null) {
result = JetTypeInfo.create(null, thenDataFlowInfo.or(elseDataFlowInfo));
resultDataFlowInfo = thenDataFlowInfo.or(elseDataFlowInfo);
}
else if (thenType == null || (jumpInThen && !jumpInElse)) {
result = elseTypeInfo;
resultDataFlowInfo = elseDataFlowInfo;
}
else if (elseType == null || (jumpInElse && !jumpInThen)) {
result = thenTypeInfo;
resultDataFlowInfo = thenDataFlowInfo;
}
else {
result = JetTypeInfo.create(resolvedCall.getResultingDescriptor().getReturnType(), thenDataFlowInfo.or(elseDataFlowInfo));
resultDataFlowInfo = thenDataFlowInfo.or(elseDataFlowInfo);
}
return DataFlowUtils.checkImplicitCast(result.getType(), ifExpression, contextWithExpectedType, isStatement, result.getDataFlowInfo());
JetType resultType = resolvedCall.getResultingDescriptor().getReturnType();
return DataFlowUtils.checkImplicitCast(resultType, ifExpression, contextWithExpectedType, isStatement, resultDataFlowInfo);
}
@NotNull