From c0d75269af532e299b81235d6f6e7f142fc6f79b Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 12 Nov 2013 21:54:45 +0400 Subject: [PATCH] Explicitly check for NO_IDENTIFIER_INFO --- .../jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java index 173f6e40f80..5a438070914 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java @@ -48,7 +48,7 @@ public class DataFlowValueFactory { } if (TypeUtils.equalTypes(type, KotlinBuiltIns.getInstance().getNullableNothingType())) return DataFlowValue.NULL; // 'null' is the only inhabitant of 'Nothing?' IdentifierInfo result = getIdForStableIdentifier(expression, bindingContext); - return new DataFlowValue(result.id == null ? expression : result.id, type, result.isStable, getImmanentNullability(type)); + return new DataFlowValue(result == NO_IDENTIFIER_INFO ? expression : result.id, type, result.isStable, getImmanentNullability(type)); } @NotNull