Create SlicedMapImpl#collectiveSliceKeys on demand

JetBrains · May 21, 2015 · d8b1856 · d8b1856
1 parent 492404b
commit d8b1856
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java
@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 
 public class SlicedMapImpl implements MutableSlicedMap {
@@ -35,7 +36,7 @@ public static SlicedMapImpl create() {
     }
 
     private final Map<Object, UserDataHolderImpl> map = new THashMap<Object, UserDataHolderImpl>(0);
-    private final Multimap<WritableSlice<?, ?>, Object> collectiveSliceKeys = ArrayListMultimap.create();
+    private Multimap<WritableSlice<?, ?>, Object> collectiveSliceKeys = null;
 
     @Override
     public <K, V> void put(WritableSlice<K, V> slice, K key, V value) {
@@ -63,6 +64,10 @@ public <K, V> void put(WritableSlice<K, V> slice, K key, V value) {
         }
 
         if (slice.isCollective()) {
+            if (collectiveSliceKeys == null) {
+                collectiveSliceKeys = ArrayListMultimap.create();
+            }
+
             collectiveSliceKeys.put(slice, key);
         }
 
@@ -88,6 +93,8 @@ public <K, V> V get(ReadOnlySlice<K, V> slice, K key) {
     @SuppressWarnings("unchecked")
     public <K, V> Collection<K> getKeys(WritableSlice<K, V> slice) {
         assert slice.isCollective() : "Keys are not collected for slice " + slice;
+
+        if (collectiveSliceKeys == null) return Collections.emptyList();
         return (Collection<K>) collectiveSliceKeys.get(slice);
     }