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

Avoid creating empty hash maps in DataFlowInfoForArgumentsImpl

Browse Source
This commit is contained in:
Alexander Udalov
2015-08-06 13:46:27 +03:00
parent fd006c521f
commit 182e2ebbab
1 changed files with 11 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
+11 -5
View File
@@ -16,20 +16,20 @@
package org.jetbrains.kotlin.resolve.calls.model; package org.jetbrains.kotlin.resolve.calls.model;
import com.google.common.collect.Maps;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.Call;
import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.kotlin.psi.ValueArgument;
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class DataFlowInfoForArgumentsImpl implements MutableDataFlowInfoForArguments { public class DataFlowInfoForArgumentsImpl implements MutableDataFlowInfoForArguments {
private final Call call; //for better debug messages only private final Call call; //for better debug messages only
private final Map<ValueArgument, DataFlowInfo> infoMap = Maps.newHashMap(); private Map<ValueArgument, DataFlowInfo> infoMap = null;
private final Map<ValueArgument, ValueArgument> nextArgument = Maps.newHashMap(); private Map<ValueArgument, ValueArgument> nextArgument = null;
private DataFlowInfo initialInfo; private DataFlowInfo initialInfo;
private DataFlowInfo resultInfo; private DataFlowInfo resultInfo;
@@ -44,6 +44,9 @@ public class DataFlowInfoForArgumentsImpl implements MutableDataFlowInfoForArgum
while (iterator.hasNext()) { while (iterator.hasNext()) {
ValueArgument argument = iterator.next(); ValueArgument argument = iterator.next();
if (prev != null) { if (prev != null) {
if (nextArgument == null) {
nextArgument = new HashMap<ValueArgument, ValueArgument>();
}
nextArgument.put(prev, argument); nextArgument.put(prev, argument);
} }
prev = argument; prev = argument;
@@ -59,7 +62,7 @@ public class DataFlowInfoForArgumentsImpl implements MutableDataFlowInfoForArgum
@NotNull @NotNull
@Override @Override
public DataFlowInfo getInfo(@NotNull ValueArgument valueArgument) { public DataFlowInfo getInfo(@NotNull ValueArgument valueArgument) {
DataFlowInfo infoForArgument = infoMap.get(valueArgument); DataFlowInfo infoForArgument = infoMap == null ? null : infoMap.get(valueArgument);
if (infoForArgument == null) { if (infoForArgument == null) {
return initialInfo; return initialInfo;
} }
@@ -68,8 +71,11 @@ public class DataFlowInfoForArgumentsImpl implements MutableDataFlowInfoForArgum
@Override @Override
public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo) { public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo) {
ValueArgument next = nextArgument.get(valueArgument); ValueArgument next = nextArgument == null ? null : nextArgument.get(valueArgument);
if (next != null) { if (next != null) {
if (infoMap == null) {
infoMap = new HashMap<ValueArgument, DataFlowInfo>();
}
infoMap.put(next, dataFlowInfo); infoMap.put(next, dataFlowInfo);
return; return;
} }