[GR-23240][GR-23241][GR-23255][GR-23976] make test_iter*, test_range.test_types and test_list.*pickle pass

PullRequest: graalpython/1148

Author: qunaibit

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

@@ -17,6 +17,7 @@
 *graalpython.lib-python.3.test.test_iter.TestCase.test_iter_callable
 *graalpython.lib-python.3.test.test_iter.TestCase.test_iter_class_for
 *graalpython.lib-python.3.test.test_iter.TestCase.test_iter_class_iter
+*graalpython.lib-python.3.test.test_iter.TestCase.test_iter_dict
 *graalpython.lib-python.3.test.test_iter.TestCase.test_iter_empty
 *graalpython.lib-python.3.test.test_iter.TestCase.test_iter_file
 *graalpython.lib-python.3.test.test_iter.TestCase.test_iter_for_loop
@@ -30,10 +31,13 @@
 *graalpython.lib-python.3.test.test_iter.TestCase.test_iter_string
 *graalpython.lib-python.3.test.test_iter.TestCase.test_iter_tuple
 *graalpython.lib-python.3.test.test_iter.TestCase.test_mutating_seq_class_exhausted_iter
+*graalpython.lib-python.3.test.test_iter.TestCase.test_mutating_seq_class_iter_pickle
 *graalpython.lib-python.3.test.test_iter.TestCase.test_nested_comprehensions_for
 *graalpython.lib-python.3.test.test_iter.TestCase.test_nested_comprehensions_iter
 *graalpython.lib-python.3.test.test_iter.TestCase.test_new_style_iter_class
 *graalpython.lib-python.3.test.test_iter.TestCase.test_ref_counting_behavior
+*graalpython.lib-python.3.test.test_iter.TestCase.test_seq_class_for
+*graalpython.lib-python.3.test.test_iter.TestCase.test_seq_class_iter
 *graalpython.lib-python.3.test.test_iter.TestCase.test_sinkstate_callable
 *graalpython.lib-python.3.test.test_iter.TestCase.test_sinkstate_dict
 *graalpython.lib-python.3.test.test_iter.TestCase.test_sinkstate_enumerate

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

@@ -2,9 +2,21 @@
 *graalpython.lib-python.3.test.test_iterlen.TestDeque.test_invariant
 *graalpython.lib-python.3.test.test_iterlen.TestDequeReversed.test_immutable_during_iteration
 *graalpython.lib-python.3.test.test_iterlen.TestDequeReversed.test_invariant
+*graalpython.lib-python.3.test.test_iterlen.TestDictItems.test_immutable_during_iteration
+*graalpython.lib-python.3.test.test_iterlen.TestDictItems.test_invariant
+*graalpython.lib-python.3.test.test_iterlen.TestDictKeys.test_immutable_during_iteration
+*graalpython.lib-python.3.test.test_iterlen.TestDictKeys.test_invariant
+*graalpython.lib-python.3.test.test_iterlen.TestDictValues.test_immutable_during_iteration
+*graalpython.lib-python.3.test.test_iterlen.TestDictValues.test_invariant
 *graalpython.lib-python.3.test.test_iterlen.TestLengthHintExceptions.test_invalid_hint
+*graalpython.lib-python.3.test.test_iterlen.TestLengthHintExceptions.test_issue1242657
 *graalpython.lib-python.3.test.test_iterlen.TestList.test_invariant
+*graalpython.lib-python.3.test.test_iterlen.TestList.test_mutation
 *graalpython.lib-python.3.test.test_iterlen.TestListReversed.test_invariant
+*graalpython.lib-python.3.test.test_iterlen.TestListReversed.test_mutation
+*graalpython.lib-python.3.test.test_iterlen.TestRepeat.test_invariant
+*graalpython.lib-python.3.test.test_iterlen.TestSet.test_immutable_during_iteration
+*graalpython.lib-python.3.test.test_iterlen.TestSet.test_invariant
 *graalpython.lib-python.3.test.test_iterlen.TestTuple.test_invariant
 *graalpython.lib-python.3.test.test_iterlen.TestXrange.test_invariant
 *graalpython.lib-python.3.test.test_iterlen.TestXrangeCustomReversed.test_invariant

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

@@ -27,6 +27,7 @@
 *graalpython.lib-python.3.test.test_list.ListTest.test_index
 *graalpython.lib-python.3.test.test_list.ListTest.test_init
 *graalpython.lib-python.3.test.test_list.ListTest.test_insert
+*graalpython.lib-python.3.test.test_list.ListTest.test_iterator_pickle
 *graalpython.lib-python.3.test.test_list.ListTest.test_keyword_args
 *graalpython.lib-python.3.test.test_list.ListTest.test_len
 *graalpython.lib-python.3.test.test_list.ListTest.test_minmax
@@ -43,6 +44,7 @@
 *graalpython.lib-python.3.test.test_list.ListTest.test_repr_large
 *graalpython.lib-python.3.test.test_list.ListTest.test_reverse
 *graalpython.lib-python.3.test.test_list.ListTest.test_reversed
+*graalpython.lib-python.3.test.test_list.ListTest.test_reversed_pickle
 *graalpython.lib-python.3.test.test_list.ListTest.test_set_subscript
 *graalpython.lib-python.3.test.test_list.ListTest.test_setitem
 *graalpython.lib-python.3.test.test_list.ListTest.test_setitem_error

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

@@ -14,5 +14,11 @@
 *graalpython.lib-python.3.test.test_range.RangeTest.test_odd_bug
 *graalpython.lib-python.3.test.test_range.RangeTest.test_pickling
 *graalpython.lib-python.3.test.test_range.RangeTest.test_range
+*graalpython.lib-python.3.test.test_range.RangeTest.test_range_iterators
 *graalpython.lib-python.3.test.test_range.RangeTest.test_range_iterators_invocation
 *graalpython.lib-python.3.test.test_range.RangeTest.test_repr
+*graalpython.lib-python.3.test.test_range.RangeTest.test_reverse_iteration
+*graalpython.lib-python.3.test.test_range.RangeTest.test_slice
+*graalpython.lib-python.3.test.test_range.RangeTest.test_strided_limits
+*graalpython.lib-python.3.test.test_range.RangeTest.test_types
+*graalpython.lib-python.3.test.test_range.RangeTest.test_user_index_method

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

@@ -43,6 +43,7 @@
 import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins.BytesLikeNoGeneralizationNode;
 import com.oracle.graal.python.builtins.objects.common.IndexNodes.NormalizeIndexNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.iterator.IteratorNodes;
 import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
@@ -151,8 +152,10 @@ public abstract static class ByteArrayExtendNode extends PythonBinaryBuiltinNode
 
         @Specialization
         PNone doGeneric(VirtualFrame frame, PByteArray byteArray, Object source,
+                        @Cached IteratorNodes.GetLength lenNode,
                         @Cached("createExtend()") SequenceStorageNodes.ExtendNode extendNode) {
-            SequenceStorage execute = extendNode.execute(frame, byteArray.getSequenceStorage(), source);
+            int len = lenNode.execute(frame, source);
+            SequenceStorage execute = extendNode.execute(frame, byteArray.getSequenceStorage(), source, len);
             assert byteArray.getSequenceStorage() == execute;
             return PNone.NONE;
         }

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

@@ -481,27 +481,39 @@ public HashingStorageIterable<DictEntry> entries(
         return new HashingStorageIterable<>(new EntriesIterator(store, readNode));
     }
 
-    private static final class EntriesIterator implements Iterator<DictEntry> {
-        private final Iterator<Object> keyIter;
+    protected static final class EntriesIterator implements Iterator<DictEntry> {
+        private final List<Object> keyList;
         private final DynamicObject store;
         private final ReadAttributeFromDynamicObjectNode readNode;
         private DictEntry next = null;
+        private int state;
+        private final int size;
 
         public EntriesIterator(DynamicObject store, ReadAttributeFromDynamicObjectNode readNode) {
-            this.keyIter = getIterator(store.getShape());
+            this.keyList = keyList(store.getShape());
             this.store = store;
             this.readNode = readNode;
+            this.state = 0;
+            this.size = this.keyList.size();
+        }
+
+        public int getState() {
+            return state;
+        }
+
+        public void setState(int state) {
+            this.state = state;
         }
 
         @TruffleBoundary
-        private static Iterator<Object> getIterator(Shape shape) {
+        private static Iterator<Object> getList(Shape shape) {
             return keyList(shape).iterator();
         }
 
         @TruffleBoundary
         public boolean hasNext() {
-            while (next == null && keyIter.hasNext()) {
-                Object key = keyIter.next();
+            while (next == null && state < size) {
+                Object key = keyList.get(state++);
                 Object value = readNode.execute(store, key);
                 if (value != PNone.NO_VALUE) {
                     next = new DictEntry(key, value);

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

@@ -580,13 +580,17 @@ public HashingStorageIterable<Object> reverseKeys() {
         return new HashingStorageIterable<>(new KeysIterator(map.reverseKeyIterator()));
     }
 
-    private static final class KeysIterator implements Iterator<Object> {
+    static final class KeysIterator implements Iterator<Object> {
         private final Iterator<DictKey> keysIterator;
 
         KeysIterator(Iterator<DictKey> iter) {
             this.keysIterator = iter;
         }
 
+        public Iterator<DictKey> getKeysIterator() {
+            return keysIterator;
+        }
+
         public boolean hasNext() {
             return keysIterator.hasNext();
         }

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

@@ -580,13 +580,17 @@ public HashingStorageIterable<Object> reverseValues(@CachedLibrary("this") Hashi
         return new HashingStorageIterable<>(new ValuesIterator(this, lib.reverseKeys(this).iterator(), lib));
     }
 
-    private static final class ValuesIterator implements Iterator<Object> {
+    protected static final class ValuesIterator implements Iterator<Object> {
         private final Iterator<DictEntry> entriesIterator;
 
         ValuesIterator(HashingStorage self, HashingStorageIterator<Object> keysIterator, HashingStorageLibrary lib) {
             this.entriesIterator = new EntriesIterator(self, keysIterator, lib);
         }
 
+        protected Iterator<DictEntry> getIterator() {
+            return entriesIterator;
+        }
+
         @Override
         public boolean hasNext() {
             return entriesIterator.hasNext();
@@ -608,7 +612,7 @@ public final HashingStorageIterable<DictEntry> reverseEntries(@CachedLibrary("th
         return new HashingStorageIterable<>(new EntriesIterator(this, lib.reverseKeys(this).iterator(), lib));
     }
 
-    private static final class EntriesIterator implements Iterator<DictEntry> {
+    protected static final class EntriesIterator implements Iterator<DictEntry> {
         private final HashingStorageIterator<Object> keysIterator;
         private final HashingStorage self;
         private final HashingStorageLibrary lib;
@@ -619,6 +623,10 @@ private static final class EntriesIterator implements Iterator<DictEntry> {
             this.keysIterator = keysIterator;
         }
 
+        protected HashingStorageIterator<Object> getKeysIterator() {
+            return keysIterator;
+        }
+
         @Override
         public boolean hasNext() {
             return keysIterator.hasNext();
@@ -686,13 +694,11 @@ public static HashingStorage addSequenceToStorage(VirtualFrame frame, Object ite
         try {
             while (true) {
                 Object next = nextNode.execute(frame, it);
-                PSequence element = null;
-                int len = 1;
-                element = createListNode.execute(next);
+                PSequence element = createListNode.execute(next);
                 assert element != null;
                 // This constructs a new list using the builtin type. So, the object cannot
                 // be subclassed and we can directly call 'len()'.
-                len = seqLenNode.execute(element);
+                int len = seqLenNode.execute(element);
 
                 if (lengthTwoProfile.profile(len != 2)) {
                     throw raise.raise(ValueError, ErrorMessages.DICT_UPDATE_SEQ_ELEM_HAS_LENGTH_2_REQUIRED, arrayListSize(elements), len);

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

@@ -457,9 +457,13 @@ public static final class HashingStorageIterable<T> implements Iterable<T> {
             this.iterator = iterator;
         }
 
+        public Iterator<T> getIterator() {
+            return this.iterator;
+        }
+
         @Override
         public HashingStorageIterator<T> iterator() {
-            return new HashingStorageIterator<T>(iterator);
+            return new HashingStorageIterator<T>(this.iterator);
         }
     }
 
@@ -473,16 +477,20 @@ public HashingStorageIterator(Iterator<T> iterator) {
             this.iterator = iterator;
         }
 
+        public Iterator<T> getIterator() {
+            return this.iterator;
+        }
+
         @Override
         @TruffleBoundary
         public boolean hasNext() {
-            return iterator.hasNext();
+            return this.iterator.hasNext();
         }
 
         @Override
         @TruffleBoundary
         public T next() {
-            return iterator.next();
+            return this.iterator.next();
         }
     }