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

get resulting DataFlowInfo from JetTypeInfo instead of facade

Browse Source
This commit is contained in:
Alexander Udalov
2012-06-14 14:16:42 +04:00
parent 3e79d3c834
commit c3420e864e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
+1 -4
View File
@@ -334,10 +334,7 @@ public class ExpressionTypingServices {
result = blockLevelVisitor.getTypeInfo(statementExpression, newContext, true); result = blockLevelVisitor.getTypeInfo(statementExpression, newContext, true);
} }
DataFlowInfo newDataFlowInfo = blockLevelVisitor.getResultingDataFlowInfo(); DataFlowInfo newDataFlowInfo = result.getDataFlowInfo();
if (newDataFlowInfo == null) {
newDataFlowInfo = context.dataFlowInfo;
}
if (newDataFlowInfo != context.dataFlowInfo) { if (newDataFlowInfo != context.dataFlowInfo) {
newContext = createContext(newContext, trace, scope, newDataFlowInfo, NO_EXPECTED_TYPE); newContext = createContext(newContext, trace, scope, newDataFlowInfo, NO_EXPECTED_TYPE);
} }