Merge pull request #3953 from Yaminyam/fix/range-iter

youknowone · web-flow · commit 9e9d61022f2b · 2022-07-23T18:02:58.000+09:00
Fix: `range` beyond the isize range
diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
@@ -375,8 +375,6 @@ def test_pickling(self):
                     self.assertEqual(list(pickle.loads(pickle.dumps(r, proto))),
                                      list(r))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_iterator_pickling(self):
         testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1), (13, 21, 3),
                      (-2, 2, 2)]
diff --git a/vm/src/builtins/range.rs b/vm/src/builtins/range.rs
@@ -476,9 +476,12 @@ impl Iterable for PyRange {
             zelf.step.as_bigint(),
             zelf.len(),
         );
-        if let (Some(start), Some(step), Some(_)) =
-            (start.to_isize(), step.to_isize(), stop.to_isize())
-        {
+        if let (Some(start), Some(step), Some(_), Some(_)) = (
+            start.to_isize(),
+            step.to_isize(),
+            stop.to_isize(),
+            (start + step).to_isize(),
+        ) {
             Ok(PyRangeIterator {
                 index: AtomicCell::new(0),
                 start,
