[GR-23219] Make test_dict pass - change during iteration.

PullRequest: graalpython/1043

Author: tomasstupka

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

@@ -853,4 +853,49 @@ def __eq__(self, o):
         raised = True
     assert raised
 
-    assert 'kw' not in d
+    assert 'kw' not in d
+    
+def test_iter_changed_size():
+    def just_iterate(it):
+        for i in it:
+            pass
+
+    def iterate_and_update(it):
+        for i in it:
+            d.update({3:3})
+
+    # dict
+    d = {1:1, 2:2} 
+    it = iter(d)
+    del d[1]
+    assert_raises(RuntimeError, just_iterate, it)
+    
+    d = {1:1, 2:2}
+    assert_raises(RuntimeError, iterate_and_update, d)
+
+    # keys
+    d = {1:1, 2:2}
+    it = iter(d.keys())
+    del d[1]
+    assert_raises(RuntimeError, just_iterate, it)
+
+    d = {1:1}
+    assert_raises(RuntimeError, iterate_and_update, d.keys())
+
+    # values
+    d = {1:1, 2:2} 
+    it = iter(d.values())
+    del d[1]
+    assert_raises(RuntimeError, just_iterate, it)
+
+    d = {1:1}
+    assert_raises(RuntimeError, iterate_and_update, d.values())
+
+    # items
+    d = {1:1, 2:2}
+    it = iter(d.items())
+    del d[1]
+    assert_raises(RuntimeError, just_iterate, it)
+
+    d = {1:1}
+    assert_raises(RuntimeError, iterate_and_update, d.items())

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -129,3 +129,16 @@ def test_iter():
     mp_keys = set([k for k in mp])
     assert d.keys() == mp_keys
 
+def test_iter_changed_size():
+    class A:
+        pass
+
+    def foo():
+        pass
+
+    try:
+        for i in A.__dict__:
+            setattr(A, 'foo', foo)
+    except RuntimeError:
+        raised = True
+    assert raised

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

@@ -460,4 +460,21 @@ def __len__(self):
     assert {10, 11}.isdisjoint(NonSetWithIter())
     assert {10, 11, 12, 13, 14}.isdisjoint(NonSetWithIter())
     assert not {1, 2}.isdisjoint(NonSetWithIter())
-    assert not {1, 2, 3, 4, 5}.isdisjoint(NonSetWithIter())
+    assert not {1, 2, 3, 4, 5}.isdisjoint(NonSetWithIter())
+
+def test_iter_changed_size():
+    def just_iterate(it):
+        for i in it:
+            pass
+
+    def iterate_and_update(it):
+        for i in it:
+            s.add(3)
+
+    s = {1, 2}
+    it = iter(s)
+    s.pop()
+    assert_raises(RuntimeError, just_iterate, it)
+
+    s = {1, 2}
+    assert_raises(RuntimeError, iterate_and_update, s)

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_dict.txt

@@ -37,6 +37,7 @@
 *graalpython.lib-python.3.test.test_dict.DictTest.test_mutating_lookup
 *graalpython.lib-python.3.test.test_dict.DictTest.test_object_set_item_single_instance_non_str_key
 *graalpython.lib-python.3.test.test_dict.DictTest.test_pop
+*graalpython.lib-python.3.test.test_dict.DictTest.test_popitem
 *graalpython.lib-python.3.test.test_dict.DictTest.test_reentrant_insertion
 *graalpython.lib-python.3.test.test_dict.DictTest.test_repr
 *graalpython.lib-python.3.test.test_dict.DictTest.test_repr_deep
@@ -61,19 +62,29 @@
 *graalpython.lib-python.3.test.test_dict.DictTest.test_values
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_bool
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_constructor
+*graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_get
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_getitem
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_items
+*graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_keys
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_len
+*graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_pop
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_popitem
+*graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_read
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_setdefault
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_update
 *graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_values
+*graalpython.lib-python.3.test.test_dict.GeneralMappingTests.test_write
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_bool
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_constructor
+*graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_get
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_getitem
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_items
+*graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_keys
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_len
+*graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_pop
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_popitem
+*graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_read
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_setdefault
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_update
 *graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_values
+*graalpython.lib-python.3.test.test_dict.SubclassMappingTests.test_write

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

@@ -341,7 +341,9 @@ private static Object runNode(DynamicObjectStorage self, Object key, Object acc,
     @ExportMessage
     @TruffleBoundary
     public HashingStorage clear() {
-        return new DynamicObjectStorage();
+        store.setShapeAndResize(store.getShape(), EMPTY_SHAPE);
+        store.updateShape();
+        return this;
     }
 
     @Override

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

@@ -372,16 +372,17 @@ static HashingStorage delItemWithStateWithSideEffect(EconomicMapStorage self, Ob
     static class Clear {
 
         @Specialization(guards = "!hasSideEffect(self)")
-        static HashingStorage clear(@SuppressWarnings("unused") EconomicMapStorage self) {
-            return create();
+        static HashingStorage clear(EconomicMapStorage self) {
+            self.map.clear();
+            return self;
         }
 
         @Specialization
         static HashingStorage clearWithSideEffect(EconomicMapStorage self,
                         @Exclusive @Cached LookupInheritedAttributeNode.Dynamic lookup,
                         @Exclusive @Cached CallUnaryMethodNode callNode) {
             if (self.map.size() == 0) {
-                return create();
+                return self;
             }
             Object[] entries = new Object[self.map.size() * 2];
             MapCursor<DictKey, Object> cursor = self.map.getEntries();
@@ -398,7 +399,7 @@ static HashingStorage clearWithSideEffect(EconomicMapStorage self,
                     callNode.executeObject(lookup.execute(o, __DEL__), o);
                 }
             }
-            return create();
+            return self;
         }
 
     }