mirror of
https://github.com/python/cpython.git
synced 2025-09-11 11:17:16 +00:00
[3.14] GH-135171: Fix generator expressions one last time (hopefully) (GH-135225)
* Add NULL check to FOR_ITER * Move GET_ITER back to genexpr creation
This commit is contained in:
parent
1497866198
commit
a5274cd215
8 changed files with 92 additions and 19 deletions
11
Python/executor_cases.c.h
generated
11
Python/executor_cases.c.h
generated
|
@ -4273,8 +4273,17 @@
|
|||
_PyStackRef next;
|
||||
iter = stack_pointer[-1];
|
||||
PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
|
||||
iternextfunc func = Py_TYPE(iter_o)->tp_iternext;
|
||||
if (func == NULL) {
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
_PyErr_Format(tstate, PyExc_TypeError,
|
||||
"'%.100s' object is not an iterator",
|
||||
Py_TYPE(iter_o)->tp_name);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
JUMP_TO_ERROR();
|
||||
}
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyObject *next_o = (*Py_TYPE(iter_o)->tp_iternext)(iter_o);
|
||||
PyObject *next_o = func(iter_o);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
if (next_o == NULL) {
|
||||
if (_PyErr_Occurred(tstate)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue