From aa3a7c2838295a1d5257a37ebabf6392844f0d9e Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Wed, 16 Sep 2015 15:04:03 +0300
Subject: [PATCH] Data flow info for arguments: nullability refactoring

---
 .../calls/model/DataFlowInfoForArgumentsImpl.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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
index 414e76ec8e3..2abeee87676 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArgumentsImpl.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArgumentsImpl.java
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.resolve.calls.model;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.psi.Call;
 import org.jetbrains.kotlin.psi.ValueArgument;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
@@ -27,11 +28,11 @@ import java.util.List;
 import java.util.Map;
 
 public class DataFlowInfoForArgumentsImpl implements MutableDataFlowInfoForArguments {
-    private final Call call; //for better debug messages only
-    private Map<ValueArgument, DataFlowInfo> infoMap = null;
-    private Map<ValueArgument, ValueArgument> nextArgument = null;
-    private DataFlowInfo initialInfo;
-    private DataFlowInfo resultInfo;
+    @NotNull  private final Call call; //for better debug messages only
+    @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;
@@ -62,6 +63,7 @@ public class DataFlowInfoForArgumentsImpl implements MutableDataFlowInfoForArgum
     @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;