[GR-17548] The dict concat doesn't work.

PullRequest: graalpython/663

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/test_dict.py

@@ -505,4 +505,24 @@ def test_wrapped_string_contains2():
 def test_wrapped_string_get():
     a = 'test'
     dict = locals()
-    assert dict['a']
+    assert dict['a']
+
+def test_concat():
+    r = {**{}}
+    assert len(r) == 0
+
+    r = {**{1:2}}
+    assert len(r) == 1
+    assert set(r.keys()) == {1}
+    assert set(r.values()) == {2}
+
+    r = {**{}, 1:2}
+    assert len(r) == 1
+    assert set(r.keys()) == {1}
+    assert set(r.values()) == {2}
+
+    r = {**{1:2}, 3:4, 6:8}
+    assert len(r) == 3
+    assert set(r.keys()) == {1, 3, 6}
+    assert set(r.values()) == {2, 4, 8}
+    

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

@@ -82,8 +82,9 @@ private void addAllToDict(VirtualFrame frame, PDict dict, PDict other) {
         }
         HashingStorage dictStorage = dict.getDictStorage();
         for (Object key : other.keys()) {
-            setItemNode.execute(frame, dictStorage, key, getItemNode.execute(frame, other.getDictStorage(), key));
+            dictStorage = setItemNode.execute(frame, dictStorage, key, getItemNode.execute(frame, other.getDictStorage(), key));
         }
+        dict.setDictStorage(dictStorage);
     }
 
     private static PDict expectDict(Object first) {