sthagen
diff --git a/‎crates/vm/src/builtins/range.rs‎
Lines changed: 5 additions & 1 deletion b/‎crates/vm/src/builtins/range.rs‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎extra_tests/snippets/builtin_range.py‎
Lines changed: 11 additions & 0 deletions b/‎extra_tests/snippets/builtin_range.py‎
Lines changed: 11 additions & 0 deletions
@@ -720,13 +720,17 @@ fn range_iter_reduce(
     vm: &VirtualMachine,
 ) -> PyTupleRef {
     let iter = builtins_iter(vm);
+    // CPython pickles the remaining range with a None state. next() increments
+    // the index unconditionally, so clamp it to length before rebasing start.
+    let index = BigInt::from(index).min(length.clone());
     let stop = start.clone() + length * step.clone();
+    let start = start + index * step.clone();
     let range = PyRange {
         start: PyInt::from(start).into_ref(&vm.ctx),
         stop: PyInt::from(stop).into_ref(&vm.ctx),
         step: PyInt::from(step).into_ref(&vm.ctx),
     };
-    vm.new_tuple((iter, (range,), index))
+    vm.new_tuple((iter, (range,), vm.ctx.none()))
 }
 
 // Silently clips state (i.e index) in range [0, usize::MAX].
 
@@ -118,6 +118,17 @@
 assert range(10, 1, -2).__reduce__()[0] == range
 assert range(10, 1, -2).__reduce__()[1] == (10, 1, -2)
 
+# range iterator __reduce__ (state is None, range rebased to current position)
+it = iter(range(10))
+next(it)
+next(it)
+next(it)
+assert it.__reduce__()[0] is iter
+assert it.__reduce__()[1] == (range(3, 10),)
+assert it.__reduce__()[2] is None
+assert iter(range(3)).__reduce__()[1:] == ((range(0, 3),), None)
+assert reversed(range(3)).__reduce__()[1:] == ((range(2, -1, -1),), None)
+
 # range retains the original int refs
 i = 2**64
 assert range(i).stop is i