[GR-13170] Kwargs are ignored during creating dict.

PullRequest: graalpython/336

Author: ppisl

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

@@ -176,6 +176,12 @@ def __len__(self):
     assert set(d.keys()) == key_set, "unexpected keys: %s" % str(d.keys())
     assert set(d.values()) == { 97, 98, 99, 100 }, "unexpected values: %s" % str(d.values())
 
+def test_init_kwargs():
+    kwargs = {'ONE':'one', 'TWO' : 'two'}
+    d = dict([(1,11),(2,22)], **kwargs)
+    assert len(d) == 4, "invalid length, expected 4 but was %d" % len(d)
+    assert set(d.keys()) == {1,2,'ONE','TWO'}, "unexpected keys: %s" % str(d.keys())
+    assert set(d.values()) == { 11, 22, 'one', 'two' }, "unexpected values: %s" % str(d.values())
 
 def test_custom_key_object0():
     class CollisionKey:

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

@@ -359,7 +359,7 @@ private SetItemNode getSetItemNode() {
 
         @Specialization(guards = {"!isNoValue(iterable)", "!isPDict(iterable)", "!hasKeysAttribute(iterable)"})
         @TruffleBoundary
-        public HashingStorage doSequence(PythonObject iterable, @SuppressWarnings("unused") PKeyword[] kwargs,
+        public HashingStorage doSequence(PythonObject iterable, PKeyword[] kwargs,
                         @Cached("create()") GetIteratorNode getIterator,
                         @Cached("create()") FastConstructListNode createListNode,
                         @Cached("create(__GETITEM__)") LookupAndCallBinaryNode getItemNode,
@@ -400,12 +400,14 @@ public HashingStorage doSequence(PythonObject iterable, @SuppressWarnings("unuse
                 }
             }
 
-            HashingStorage storage = PDict.createNewStorage(isStringKey, elements.size());
+            HashingStorage storage = PDict.createNewStorage(isStringKey, elements.size() + kwargs.length);
             for (int j = 0; j < elements.size(); j++) {
                 PSequence element = elements.get(j);
                 storage = getSetItemNode().execute(storage, getItemNode.executeObject(element, 0), getItemNode.executeObject(element, 1));
             }
-
+            if (kwargs.length > 0) {
+                storage.addAll(new KeywordsStorage(kwargs));
+            }
             return storage;
         }