Skip to content

gh-100762: Fix optimization in gen_close #111069

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

Merged
iritkatriel merged 6 commits into from
Oct 25, 2023
Merged

gh-100762: Fix optimization in gen_close #111069

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
084c91a
gh-100762: fix refleak in gen_close
iritkatriel Oct 19, 2023
eafd6b1
assert instead
iritkatriel Oct 19, 2023
d3e4f64
op.code --> op.arg
iritkatriel Oct 19, 2023
9a83cf8
whitespace
iritkatriel Oct 19, 2023
90d6409
set frame state when returning early
iritkatriel Oct 20, 2023
86b325d
apply review comments
iritkatriel Oct 24, 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
Prev Previous commit
Next Next commit
assert instead
  • Loading branch information
@iritkatriel
iritkatriel committed Oct 19, 2023
commit eafd6b15f7a38e3a8ea3773b4cb93a219ab827e9
4 changes: 3 additions & 1 deletion Objects/genobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,17 +378,19 @@ static PyObject *
gen_close(PyGenObject *gen, PyObject *args)
{
PyObject *retval;
PyObject *yf = _PyGen_yf(gen);
int err = 0;

if (gen->gi_frame_state == FRAME_CREATED) {
assert(yf == NULL);
gen->gi_frame_state = FRAME_COMPLETED;
Py_RETURN_NONE;
}
if (gen->gi_frame_state >= FRAME_COMPLETED) {
assert(yf == NULL);
Py_RETURN_NONE;
}

Comment thread
iritkatriel marked this conversation as resolved.
Outdated
PyObject *yf = _PyGen_yf(gen);
if (yf) {
PyFrameState state = gen->gi_frame_state;
gen->gi_frame_state = FRAME_EXECUTING;
Expand Down