diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java index 4cee67c1b5a..dc68014f924 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java @@ -334,10 +334,7 @@ public class ExpressionTypingServices { result = blockLevelVisitor.getTypeInfo(statementExpression, newContext, true); } - DataFlowInfo newDataFlowInfo = blockLevelVisitor.getResultingDataFlowInfo(); - if (newDataFlowInfo == null) { - newDataFlowInfo = context.dataFlowInfo; - } + DataFlowInfo newDataFlowInfo = result.getDataFlowInfo(); if (newDataFlowInfo != context.dataFlowInfo) { newContext = createContext(newContext, trace, scope, newDataFlowInfo, NO_EXPECTED_TYPE); }