[GR-20545] IndexedValueMap: Do not extend array when out of bounds is set to null.

PullRequest: graal/5503

Author: Stefan Anzinger

compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java

@@ -69,10 +69,9 @@ private final class BasePointersSet extends ValueSet<Marker.BasePointersSet> {
             private BasePointersSet(BasePointersSet other) {
                 variables = new IndexedValueMap(other.variables);
                 // Deep copy.
-                baseDerivedRefs = new HashMap<>();
+                baseDerivedRefs = new HashMap<>(other.baseDerivedRefs.size());
                 for (Map.Entry<Integer, Set<Value>> entry : other.baseDerivedRefs.entrySet()) {
-                    Set<Value> s = new HashSet<>();
-                    s.addAll(entry.getValue());
+                    Set<Value> s = new HashSet<>(entry.getValue());
                     baseDerivedRefs.put(entry.getKey(), s);
                 }
             }
@@ -121,8 +120,7 @@ public void putAll(BasePointersSet v) {
                     Set<Value> derivedRefs = baseDerivedRefs.get(k);
                     if (derivedRefs == null) {
                         // Deep copy.
-                        Set<Value> s = new HashSet<>();
-                        s.addAll(derivedRefsOther);
+                        Set<Value> s = new HashSet<>(derivedRefsOther);
                         baseDerivedRefs.put(k, s);
                     } else {
                         derivedRefs.addAll(derivedRefsOther);

compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/IndexedValueMap.java

@@ -65,6 +65,9 @@ public Value get(int index) {
 
     public void put(int index, Value value) {
         if (values.length <= index) {
+            if (value == null) {
+                return;
+            }
             Value[] newValues = new Value[index + 1];
             if (values.length > 0) {
                 System.arraycopy(values, 0, newValues, 0, values.length);