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

Fix for 'null is Nothing' false-positive

Browse Source
This commit is contained in:
Andrey Breslav
2011-04-15 19:09:22 +04:00
parent 3678b343b6
commit fad3030e37
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+1 -2
View File
@@ -120,7 +120,6 @@ public class JetTypeInferrer {
return resolutionResult.isSuccess() ? resolutionResult.getFunctionDescriptor() : null; return resolutionResult.isSuccess() ? resolutionResult.getFunctionDescriptor() : null;
} }
private OverloadDomain getOverloadDomain( private OverloadDomain getOverloadDomain(
@NotNull final JetScope scope, @NotNull final JetScope scope,
@NotNull JetExpression calleeExpression, @NotNull JetExpression calleeExpression,
@@ -409,7 +408,7 @@ public class JetTypeInferrer {
expression.accept(this); expression.accept(this);
if (result != null) { if (result != null) {
trace.recordExpressionType(expression, result); trace.recordExpressionType(expression, result);
if (JetStandardClasses.isNothing(result)) { if (JetStandardClasses.isNothing(result) && !result.isNullable()) {
markDominatedExpressionsAsUnreachable(expression); markDominatedExpressionsAsUnreachable(expression);
} }
} }
idea/testData/checker/UnreachableCode.jet
+8
View File
@@ -151,3 +151,11 @@ fun foo(a : Nothing) : Unit {
fun fail() : Nothing { fun fail() : Nothing {
throw new java.lang.RuntimeException() throw new java.lang.RuntimeException()
} }
fun nullIsNotNothing() : Unit {
val x : Int? = 1
if (x != null) {
return
}
fail()
}