[hotfix] fix creation of dict from dict and kwargs, when storage is unmodifiable (of the src dict)

PullRequest: graalpython-open/39

Author: cosminbasca

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

@@ -285,3 +285,7 @@ def test_create_seq_and_kw():
     d = dict({'a': 1, 'b': 2, 'c': 3}, d=4)
     for k in ['a', 'b', 'c', 'd']:
         assert k in d
+
+    d = dict(dict(a=1, b=2, c=3), d=4)
+    for k in ['a', 'b', 'c', 'd']:
+        assert k in d

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

@@ -300,6 +300,13 @@ public void doPDict(PDict self, PDict iterable, @SuppressWarnings("unused") PKey
             self.setDictStorage(iterable.getDictStorage().copy(HashingStorage.DEFAULT_EQIVALENCE));
         }
 
+        @Specialization(guards = {"!isNoValue(iterable)", "!isEmpty(kwargs)"}, rewriteOn = HashingStorage.UnmodifiableStorageException.class)
+        public void doPDictKwargs(PDict self, PDict iterable, PKeyword[] kwargs,
+                        @Cached("create()") UnionNode unionNode) {
+            HashingStorage dictStorage = unionNode.execute(iterable.getDictStorage(), new KeywordsStorage(kwargs));
+            self.setDictStorage(dictStorage);
+        }
+
         @Specialization(guards = {"!isNoValue(iterable)", "!isEmpty(kwargs)"})
         public void doPDictKwargs(PDict self, PDict iterable, PKeyword[] kwargs) {
             HashingStorage dictStorage = iterable.getDictStorage().copy(HashingStorage.DEFAULT_EQIVALENCE);