From c3420e864e4986d2ef60ab79bcff109f01896e2f Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 14 Jun 2012 14:16:42 +0400
Subject: [PATCH] get resulting DataFlowInfo from JetTypeInfo instead of facade

---
 .../jet/lang/types/expressions/ExpressionTypingServices.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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);
             }