Get rid of MutableDataFlorInfoForArguments.setInitialDataFlowInfo

mglukhikh · mglukhikh · commit 16d97ab72c0f · 2016-01-15T17:22:38.000+03:00
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
@@ -41,6 +41,7 @@ import org.jetbrains.kotlin.resolve.calls.ValueArgumentsToParametersMapper
 import org.jetbrains.kotlin.resolve.calls.callUtil.getCall
 import org.jetbrains.kotlin.resolve.calls.model.*
 import org.jetbrains.kotlin.resolve.calls.resolvedCallUtil.getExplicitReceiverValue
+import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
 import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
 import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate
 import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy
@@ -112,7 +113,7 @@ fun getExpectedTypePredicate(
                     resolutionCandidate,
                     DelegatingBindingTrace(bindingContext, "Compute type predicates for unresolved call arguments"),
                     TracingStrategy.EMPTY,
-                    DataFlowInfoForArgumentsImpl(call)
+                    DataFlowInfoForArgumentsImpl(DataFlowInfo.EMPTY, call)
             )
             val status = ValueArgumentsToParametersMapper.mapValueArgumentsToParameters(call,
                                                                                         TracingStrategy.EMPTY,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java
@@ -313,7 +313,6 @@ public void analyzeArgumentsAndRecordTypes(
     ) {
         MutableDataFlowInfoForArguments infoForArguments = context.dataFlowInfoForArguments;
         Call call = context.call;
-        infoForArguments.setInitialDataFlowInfo(context.dataFlowInfo);
 
         for (ValueArgument argument : call.getValueArguments()) {
             KtExpression expression = argument.getArgumentExpression();
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.java
@@ -60,10 +60,10 @@ protected CallResolutionContext(
             this.dataFlowInfoForArguments = dataFlowInfoForArguments;
         }
         else if (checkArguments == CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS) {
-            this.dataFlowInfoForArguments = new DataFlowInfoForArgumentsImpl(call);
+            this.dataFlowInfoForArguments = new DataFlowInfoForArgumentsImpl(dataFlowInfo, call);
         }
         else {
-            this.dataFlowInfoForArguments = new MutableDataFlowInfoForArguments.WithoutArgumentsCheck();
+            this.dataFlowInfoForArguments = new MutableDataFlowInfoForArguments.WithoutArgumentsCheck(dataFlowInfo);
         }
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArgumentsImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArgumentsImpl.java
@@ -27,15 +27,13 @@
 import java.util.List;
 import java.util.Map;
 
-public class DataFlowInfoForArgumentsImpl implements MutableDataFlowInfoForArguments {
-    @NotNull  private final Call call; //for better debug messages only
+public class DataFlowInfoForArgumentsImpl extends MutableDataFlowInfoForArguments {
     @Nullable private Map<ValueArgument, DataFlowInfo> infoMap = null;
     @Nullable private Map<ValueArgument, ValueArgument> nextArgument = null;
-    @Nullable private DataFlowInfo initialInfo;
     @Nullable private DataFlowInfo resultInfo;
 
-    public DataFlowInfoForArgumentsImpl(@NotNull Call call) {
-        this.call = call;
+    public DataFlowInfoForArgumentsImpl(@NotNull DataFlowInfo initialInfo, @NotNull Call call) {
+        super(initialInfo);
         initNextArgMap(call.getValueArguments());
     }
 
@@ -54,21 +52,14 @@ private void initNextArgMap(@NotNull List<? extends ValueArgument> valueArgument
         }
     }
 
-    @Override
-    public void setInitialDataFlowInfo(@NotNull DataFlowInfo dataFlowInfo) {
-        //TODO assert initialInfo == null
-        initialInfo = dataFlowInfo;
-    }
-
     @NotNull
     @Override
     public DataFlowInfo getInfo(@NotNull ValueArgument valueArgument) {
-        assert initialInfo != null : "Initial data flow info was not set for call: " + call;
         DataFlowInfo infoForArgument = infoMap == null ? null : infoMap.get(valueArgument);
         if (infoForArgument == null) {
-            return initialInfo;
+            return initialDataFlowInfo;
         }
-        return initialInfo.and(infoForArgument);
+        return initialDataFlowInfo.and(infoForArgument);
     }
 
     @Override
@@ -88,8 +79,7 @@ public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowIn
     @NotNull
     @Override
     public DataFlowInfo getResultInfo() {
-        assert initialInfo != null : "Initial data flow info was not set for call: " + call;
-        if (resultInfo == null) return initialInfo;
-        return initialInfo.and(resultInfo);
+        if (resultInfo == null) return initialDataFlowInfo;
+        return initialDataFlowInfo.and(resultInfo);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableDataFlowInfoForArguments.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableDataFlowInfoForArguments.java
@@ -20,18 +20,26 @@
 import org.jetbrains.kotlin.psi.ValueArgument;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
 
-public interface MutableDataFlowInfoForArguments extends DataFlowInfoForArguments {
+public abstract class MutableDataFlowInfoForArguments implements DataFlowInfoForArguments {
 
-    void setInitialDataFlowInfo(@NotNull DataFlowInfo dataFlowInfo);
+    @NotNull protected final DataFlowInfo initialDataFlowInfo;
 
-    void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo);
+    public MutableDataFlowInfoForArguments(@NotNull DataFlowInfo initialDataFlowInfo) {
+        this.initialDataFlowInfo = initialDataFlowInfo;
+    }
 
-    class WithoutArgumentsCheck implements MutableDataFlowInfoForArguments {
-        private DataFlowInfo dataFlowInfo;
+    public abstract void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo);
 
-        @Override
-        public void setInitialDataFlowInfo(@NotNull DataFlowInfo dataFlowInfo) {
-            this.dataFlowInfo = dataFlowInfo;
+    @NotNull
+    @Override
+    public DataFlowInfo getResultInfo() {
+        return initialDataFlowInfo;
+    }
+
+    public static class WithoutArgumentsCheck extends MutableDataFlowInfoForArguments {
+
+        public WithoutArgumentsCheck(@NotNull DataFlowInfo dataFlowInfo) {
+            super(dataFlowInfo);
         }
 
         @Override
@@ -44,11 +52,5 @@ public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowIn
         public DataFlowInfo getInfo(@NotNull ValueArgument valueArgument) {
             throw new IllegalStateException();
         }
-
-        @NotNull
-        @Override
-        public DataFlowInfo getResultInfo() {
-            return dataFlowInfo;
-        }
     };
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
@@ -564,7 +564,7 @@ private void recordThisOrSuperCallInTraceAndCallExtension(
                 ResolvedCallImpl.create(resolutionCandidate,
                                         TemporaryBindingTrace.create(trace, "Fake trace for fake 'this' or 'super' resolved call"),
                                         TracingStrategy.EMPTY,
-                                        new DataFlowInfoForArgumentsImpl(call));
+                                        new DataFlowInfoForArgumentsImpl(context.dataFlowInfo, call));
         resolvedCall.markCallAsCompleted();
 
         trace.record(RESOLVED_CALL, call, resolvedCall);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java
@@ -157,15 +157,10 @@ private SimpleFunctionDescriptorImpl createFunctionDescriptorForSpecialConstruct
     }
 
     /*package*/ static MutableDataFlowInfoForArguments createIndependentDataFlowInfoForArgumentsForCall(
+            @NotNull DataFlowInfo initialDataFlowInfo,
             final Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap
     ) {
-        return new MutableDataFlowInfoForArguments() {
-            private DataFlowInfo initialDataFlowInfo;
-
-            @Override
-            public void setInitialDataFlowInfo(@NotNull DataFlowInfo dataFlowInfo) {
-                this.initialDataFlowInfo = dataFlowInfo;
-            }
+        return new MutableDataFlowInfoForArguments(initialDataFlowInfo) {
 
             @Override
             public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo) {
@@ -177,25 +172,19 @@ public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowIn
             public DataFlowInfo getInfo(@NotNull ValueArgument valueArgument) {
                 return dataFlowInfoForArgumentsMap.get(valueArgument);
             }
-
-            @NotNull
-            @Override
-            public DataFlowInfo getResultInfo() {
-                //todo merge and use
-                return initialDataFlowInfo;
-            }
         };
     }
 
     public static MutableDataFlowInfoForArguments createDataFlowInfoForArgumentsForIfCall(
             @NotNull Call callForIf,
+            @NotNull DataFlowInfo conditionInfo,
             @NotNull DataFlowInfo thenInfo,
             @NotNull DataFlowInfo elseInfo
     ) {
         Map<ValueArgument, DataFlowInfo> dataFlowInfoForArgumentsMap = Maps.newHashMap();
         dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(0), thenInfo);
         dataFlowInfoForArgumentsMap.put(callForIf.getValueArguments().get(1), elseInfo);
-        return createIndependentDataFlowInfoForArgumentsForCall(dataFlowInfoForArgumentsMap);
+        return createIndependentDataFlowInfoForArgumentsForCall(conditionInfo, dataFlowInfoForArgumentsMap);
     }
 
     /*package*/ static Call createCallForSpecialConstruction(
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java
@@ -125,7 +125,7 @@ public KotlinTypeInfo visitIfExpression(KtIfExpression ifExpression, ExpressionT
         KtBlockExpression elseBlock = psiFactory.wrapInABlockWrapper(elseBranch);
         Call callForIf = createCallForSpecialConstruction(ifExpression, ifExpression, Lists.newArrayList(thenBlock, elseBlock));
         MutableDataFlowInfoForArguments dataFlowInfoForArguments =
-                    createDataFlowInfoForArgumentsForIfCall(callForIf, thenInfo, elseInfo);
+                    createDataFlowInfoForArgumentsForIfCall(callForIf, conditionDataFlowInfo, thenInfo, elseInfo);
         ResolvedCall<FunctionDescriptor> resolvedCall = components.controlStructureTypingUtils.resolveSpecialConstructionAsCall(
                 callForIf, ResolveConstruct.IF, Lists.newArrayList("thenBranch", "elseBranch"),
                 Lists.newArrayList(false, false),

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,10 @@ protected CallResolutionContext(`
`60`	`60`	`this.dataFlowInfoForArguments = dataFlowInfoForArguments;`
`61`	`61`	`}`
`62`	`62`	`else if (checkArguments == CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS) {`
`63`		`- this.dataFlowInfoForArguments = new DataFlowInfoForArgumentsImpl(call);`
	`63`	`+ this.dataFlowInfoForArguments = new DataFlowInfoForArgumentsImpl(dataFlowInfo, call);`
`64`	`64`	`}`
`65`	`65`	`else {`
`66`		`- this.dataFlowInfoForArguments = new MutableDataFlowInfoForArguments.WithoutArgumentsCheck();`
	`66`	`+ this.dataFlowInfoForArguments = new MutableDataFlowInfoForArguments.WithoutArgumentsCheck(dataFlowInfo);`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`