diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
index 43c04463236a2a..6df918997b2b19 100644
--- a/Lib/test/test_capi/test_misc.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -2649,6 +2649,19 @@ def testfunc(a):
# Verification that the jump goes past END_FOR
# is done by manual inspection of the output
+ def test_list_edge_case(self):
+ def testfunc(it):
+ for x in it:
+ pass
+
+ opt = _testinternalcapi.get_uop_optimizer()
+ with temporary_optimizer(opt):
+ a = [1, 2, 3]
+ it = iter(a)
+ testfunc(it)
+ a.append(4)
+ with self.assertRaises(StopIteration):
+ next(it)
if __name__ == "__main__":
unittest.main()
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4b655513f656d7..60b19526b17409 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1564,6 +1564,7 @@ Python/ceval.o: \
$(srcdir)/Python/ceval_macros.h \
$(srcdir)/Python/condvar.h \
$(srcdir)/Python/generated_cases.c.h \
+ $(srcdir)/Python/executor_cases.c.h \
$(srcdir)/Include/internal/pycore_opcode_metadata.h \
$(srcdir)/Python/opcode_targets.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 15b48ae9d82672..3432b027713462 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2448,7 +2448,12 @@ dummy_func(
_PyListIterObject *it = (_PyListIterObject *)iter;
assert(Py_TYPE(iter) == &PyListIter_Type);
PyListObject *seq = it->it_seq;
- if (seq == NULL || it->it_index >= PyList_GET_SIZE(seq)) {
+ if (seq == NULL) {
+ exhausted = Py_True;
+ }
+ else if (it->it_index >= PyList_GET_SIZE(seq)) {
+ Py_DECREF(seq);
+ it->it_seq = NULL;
exhausted = Py_True;
}
else {
@@ -2499,7 +2504,12 @@ dummy_func(
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
assert(Py_TYPE(iter) == &PyTupleIter_Type);
PyTupleObject *seq = it->it_seq;
- if (seq == NULL || it->it_index >= PyTuple_GET_SIZE(seq)) {
+ if (seq == NULL) {
+ exhausted = Py_True;
+ }
+ else if (it->it_index >= PyTuple_GET_SIZE(seq)) {
+ Py_DECREF(seq);
+ it->it_seq = NULL;
exhausted = Py_True;
}
else {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 626baece814607..ae21ffad94d801 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1750,7 +1750,12 @@
_PyListIterObject *it = (_PyListIterObject *)iter;
assert(Py_TYPE(iter) == &PyListIter_Type);
PyListObject *seq = it->it_seq;
- if (seq == NULL || it->it_index >= PyList_GET_SIZE(seq)) {
+ if (seq == NULL) {
+ exhausted = Py_True;
+ }
+ else if (it->it_index >= PyList_GET_SIZE(seq)) {
+ Py_DECREF(seq);
+ it->it_seq = NULL;
exhausted = Py_True;
}
else {
@@ -1787,7 +1792,12 @@
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
assert(Py_TYPE(iter) == &PyTupleIter_Type);
PyTupleObject *seq = it->it_seq;
- if (seq == NULL || it->it_index >= PyTuple_GET_SIZE(seq)) {
+ if (seq == NULL) {
+ exhausted = Py_True;
+ }
+ else if (it->it_index >= PyTuple_GET_SIZE(seq)) {
+ Py_DECREF(seq);
+ it->it_seq = NULL;
exhausted = Py_True;
}
else {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy