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

Data flow info for arguments: nullability refactoring

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-16 15:04:03 +03:00
parent 1667f18d7c
commit aa3a7c2838
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DataFlowInfoForArgumentsImpl.java
+7 -5
View File
@@ -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;