Skip to content

[3.11] GH-100762: Don't call gen.throw() in gen.close(), unless necessary #101316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

[3.11] GH-100762: Don't call gen.throw() in gen.close(), unless necessary #101316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
028ddff
Add news item.
markshannon Jan 25, 2023
f67b210
Don't call gen.throw() from gen.close() unless necessary.
markshannon Jan 25, 2023
89aacd8
Merge branch '3.11' into 100762-backport
markshannon Jan 26, 2023
78d38d9
Merge branch '3.11' into 100762-backport
markshannon Feb 23, 2023
775c360
Merge branch '3.11' into 100762-backport
markshannon May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-01-25-11-09-56.gh-issue-100762.VuArrB.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Avoid expensive ``gen.throw()`` call when closing generators (and
coroutines) that can be closed trivially.
12 changes: 12 additions & 0 deletions Objects/genobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,13 @@ static PyObject *
gen_close(PyGenObject *gen, PyObject *args)
{
PyObject *retval;
if (gen->gi_frame_state == FRAME_CREATED) {
gen->gi_frame_state = FRAME_COMPLETED;
Py_RETURN_NONE;
}
if (gen->gi_frame_state >= FRAME_COMPLETED) {
Py_RETURN_NONE;
}
PyObject *yf = _PyGen_yf(gen);
int err = 0;

Expand All @@ -386,6 +393,11 @@ gen_close(PyGenObject *gen, PyObject *args)
gen->gi_frame_state = state;
Py_DECREF(yf);
}
_PyInterpreterFrame *frame = (_PyInterpreterFrame *)gen->gi_iframe;
assert(PyBytes_CheckExact(frame->f_code->co_exceptiontable));
if (err == 0 && PyBytes_GET_SIZE(frame->f_code->co_exceptiontable) == 0) {
Py_RETURN_NONE;
}
if (err == 0)
PyErr_SetNone(PyExc_GeneratorExit);
retval = gen_send_ex(gen, Py_None, 1, 1);
Expand Down