Fix: 'DictConcatNode' should not use 'addAll'.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java

@@ -324,9 +324,10 @@ public HashingStorage doPDictKwargs(PHashingCollection dictLike, PKeyword[] kwar
         }
 
         @Specialization(guards = "!isEmpty(kwargs)")
-        public HashingStorage doPDictKwargs(PDict iterable, PKeyword[] kwargs) {
+        public HashingStorage doPDictKwargs(PDict iterable, PKeyword[] kwargs,
+                        @Cached("create()") HashingStorageNodes.UnionNode unionNode) {
             HashingStorage dictStorage = iterable.getDictStorage().copy(HashingStorage.DEFAULT_EQIVALENCE);
-            dictStorage.addAll(new KeywordsStorage(kwargs));
+            unionNode.execute(dictStorage, new KeywordsStorage(kwargs));
             return dictStorage;
         }
 
@@ -1352,8 +1353,8 @@ public HashingStorage doGenericSet(HashingStorage left, HashingStorage right) {
         @Specialization(guards = "!setUnion")
         public HashingStorage doGeneric(HashingStorage left, HashingStorage right) {
             EconomicMapStorage newStorage = EconomicMapStorage.create(setUnion);
-            newStorage.addAll(left);
-            newStorage.addAll(right);
+            newStorage.addAll(left, getEquivalence());
+            newStorage.addAll(right, getEquivalence());
             return newStorage;
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/DictConcatNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -40,26 +40,20 @@
  */
 package com.oracle.graal.python.nodes.generator;
 
-import com.oracle.graal.python.builtins.objects.common.HashingStorage.Equivalence;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.PythonEquivalence;
+import com.oracle.graal.python.builtins.objects.common.HashingStorage;
+import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
 public final class DictConcatNode extends ExpressionNode {
 
     @Children final ExpressionNode[] mappables;
-    @Child private Equivalence equivalenceNode;
-
-    protected Equivalence getEquivalence() {
-        if (equivalenceNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            equivalenceNode = insert(new PythonEquivalence());
-        }
-        return equivalenceNode;
-    }
+    @Child private HashingStorageNodes.SetItemNode setItemNode;
+    @Child private HashingStorageNodes.GetItemNode getItemNode;
 
     private DictConcatNode(ExpressionNode... mappablesNodes) {
         this.mappables = mappablesNodes;
@@ -75,12 +69,25 @@ public Object execute(VirtualFrame frame) {
                 first = expectDict(n.execute(frame));
             } else {
                 other = expectDict(n.execute(frame));
-                first.getDictStorage().addAll(other.getDictStorage(), getEquivalence());
+                addAllToDict(first, other);
             }
         }
         return first;
     }
 
+    @TruffleBoundary
+    private void addAllToDict(PDict dict, PDict other) {
+        if (setItemNode == null || getItemNode == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            setItemNode = insert(HashingStorageNodes.SetItemNode.create());
+            getItemNode = insert(HashingStorageNodes.GetItemNode.create());
+        }
+        HashingStorage dictStorage = dict.getDictStorage();
+        for (Object key : other.keys()) {
+            setItemNode.execute(dictStorage, key, getItemNode.execute(other.getDictStorage(), key));
+        }
+    }
+
     private static PDict expectDict(Object first) {
         if (!(first instanceof PDict)) {
             CompilerDirectives.transferToInterpreter();