merge values provided in dict.__init__()

Author: tomasstupka

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

@@ -140,6 +140,13 @@ def test_init():
 
     assert_raises(TypeError, dict.fromkeys, 10)
 
+    d = {'a':1, 'b':2}
+    d.__init__()
+    assert d == {'a':1, 'b':2}
+    d.__init__({'c':3})
+    assert d == {'a':1, 'b':2, 'c':3}
+    d.__init__({'d':4})
+    assert d == {'a':1, 'b':2, 'c':3, 'd':4}
 
 def test_init1():
     try:

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java

@@ -136,8 +136,11 @@ private HashingStorage.InitNode getInitNode() {
         @Specialization(guards = {"args.length == 1", "firstArgIterable(args, lib)", "!firstArgString(args)"})
         Object doVarargs(VirtualFrame frame, PDict self, Object[] args, PKeyword[] kwargs,
                         @Cached SetDictStorageNode setStorage,
-                        @SuppressWarnings("unused") @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
-            setStorage.execute(self, getInitNode().execute(frame, args[0], kwargs));
+                        @SuppressWarnings("unused") @CachedLibrary(limit = "1") PythonObjectLibrary lib,
+                        @CachedLibrary(limit = "1") HashingStorageLibrary storageLib) {
+            HashingStorage storage = self.getDictStorage();
+            storage = storageLib.addAllToOther(getInitNode().execute(frame, args[0], kwargs), storage);
+            setStorage.execute(self, storage);
             return PNone.NONE;
         }
 
@@ -155,10 +158,19 @@ static Object doString(Object self, Object[] args, PKeyword[] kwargs,
             throw raise.raise(ValueError, ErrorMessages.DICT_UPDATE_SEQ_ELEM_HAS_LENGTH_2_REQUIRED, 0, 1);
         }
 
-        @Specialization(guards = "args.length == 0")
+        @Specialization(guards = {"args.length == 0", "kwargs.length > 0"})
         Object doKeywords(VirtualFrame frame, PDict self, @SuppressWarnings("unused") Object[] args, PKeyword[] kwargs,
-                        @Cached SetDictStorageNode setStorage) {
-            setStorage.execute(self, getInitNode().execute(frame, NO_VALUE, kwargs));
+                        @Cached SetDictStorageNode setStorage,
+                        @CachedLibrary(limit = "1") HashingStorageLibrary storageLib) {
+            HashingStorage storage = self.getDictStorage();
+            storage = storageLib.addAllToOther(getInitNode().execute(frame, NO_VALUE, kwargs), storage);
+            setStorage.execute(self, storage);
+            return PNone.NONE;
+        }
+
+        @SuppressWarnings("unused")
+        @Specialization(guards = {"args.length == 0", "kwargs.length == 0"})
+        Object doEmpty(PDict self, Object[] args, PKeyword[] kwargs) {
             return PNone.NONE;
         }