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

KT-4310 Check for definite returns

Browse Source 
#KT-4310 Fixed
This commit is contained in:
Svetlana Isakova
2013-12-16 20:00:53 +04:00
parent 43cc818506
commit 400e6d3f44
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java
+8 -2
View File
@@ -270,8 +270,14 @@ public class ControlStructureTypingUtils {
@Override
public Void visitIfExpression(@NotNull JetIfExpression ifExpression, CheckTypeContext c) {
checkExpressionType(ifExpression.getThen(), c);
checkExpressionType(ifExpression.getElse(), c);
JetExpression thenBranch = ifExpression.getThen();
JetExpression elseBranch = ifExpression.getElse();
if (thenBranch == null || elseBranch == null) {
visitExpression(ifExpression, c);
return null;
}
checkExpressionType(thenBranch, c);
checkExpressionType(elseBranch, c);
return null;
}