Skip to content

gh-143493: fix cleanup on errors in codegen_comprehension #156374

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

Open
iritkatriel wants to merge 4 commits into
base: main
Choose a base branch
from
Open

gh-143493: fix cleanup on errors in codegen_comprehension #156374

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41b06cc
fix cleanup on errors in compiler
iritkatriel Aug 25, 2026
9f47ab6
fix more stuff
iritkatriel Aug 27, 2026
347c6e2
Merge branch 'main' into compiler_error_handling
iritkatriel Aug 28, 2026
ac26f24
Merge branch 'main' into compiler_error_handling
iritkatriel Aug 30, 2026
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
80 changes: 47 additions & 33 deletions Python/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5048,6 +5048,38 @@ pop_inlined_comprehension_state(compiler *c, location loc,
return SUCCESS;
}

static int
codegen_comprehension_init_container(compiler *c, location loc, int type,
int is_inlined, bool avoid_creation)
{
int op;
switch (type) {
case COMP_LISTCOMP:
op = BUILD_LIST;
break;
case COMP_SETCOMP:
op = BUILD_SET;
break;
case COMP_DICTCOMP:
op = BUILD_MAP;
break;
default:
PyErr_Format(PyExc_SystemError,
"unknown comprehension type %d", type);
return ERROR;
}

if (!avoid_creation) {
ADDOP_I(c, loc, op, 0);
if (is_inlined) {
ADDOP_I(c, loc, SWAP, 2);
}
} else {
ADDOP_I(c, loc, COPY, 1);
}
return SUCCESS;
}

static int
codegen_comprehension(compiler *c, expr_ty e, int type,
identifier name, asdl_comprehension_seq *generators, expr_ty elt,
Expand Down Expand Up @@ -5086,19 +5118,22 @@ codegen_comprehension(compiler *c, expr_ty e, int type,
if (type == COMP_GENEXP) {
/* Insert GET_ITER before RETURN_GENERATOR.
https://docs.python.org/3/reference/expressions.html#generator-expressions */
RETURN_IF_ERROR(
_PyInstructionSequence_InsertInstruction(
if(_PyInstructionSequence_InsertInstruction(
INSTR_SEQUENCE(c), 0,
RESUME, RESUME_AT_GEN_EXPR_START, NO_LOCATION));
RETURN_IF_ERROR(
_PyInstructionSequence_InsertInstruction(
RESUME, RESUME_AT_GEN_EXPR_START, NO_LOCATION) < 0) {
goto error_in_scope;
}
if(_PyInstructionSequence_InsertInstruction(
INSTR_SEQUENCE(c), 1,
LOAD_FAST, 0, LOC(outermost->iter)));
RETURN_IF_ERROR(
_PyInstructionSequence_InsertInstruction(
LOAD_FAST, 0, LOC(outermost->iter)) < 0) {
goto error_in_scope;
}
if(_PyInstructionSequence_InsertInstruction(
INSTR_SEQUENCE(c), 2,
outermost->is_async ? GET_AITER : GET_ITER,
0, LOC(outermost->iter)));
0, LOC(outermost->iter)) < 0) {
goto error_in_scope;
}
iter_state = ITERATOR_ON_STACK;
}
else {
Expand All @@ -5108,31 +5143,10 @@ codegen_comprehension(compiler *c, expr_ty e, int type,
Py_CLEAR(entry);

if (type != COMP_GENEXP) {
int op;
switch (type) {
case COMP_LISTCOMP:
op = BUILD_LIST;
break;
case COMP_SETCOMP:
op = BUILD_SET;
break;
case COMP_DICTCOMP:
op = BUILD_MAP;
break;
default:
PyErr_Format(PyExc_SystemError,
"unknown comprehension type %d", type);
if (codegen_comprehension_init_container(
c, loc, type, is_inlined, avoid_creation) < 0) {
goto error_in_scope;
}

if (!avoid_creation) {
ADDOP_I(c, loc, op, 0);
if (is_inlined) {
ADDOP_I(c, loc, SWAP, 2);
}
} else {
ADDOP_I(c, loc, COPY, 1);
}
}
if (codegen_comprehension_generator(c, loc, generators, 0, 0,
elt, val, type, iter_state, avoid_creation) < 0) {
Expand All @@ -5147,7 +5161,7 @@ codegen_comprehension(compiler *c, expr_ty e, int type,
}

if (type != COMP_GENEXP) {
ADDOP(c, LOC(e), RETURN_VALUE);
ADDOP_IN_SCOPE(c, LOC(e), RETURN_VALUE);
}
if (type == COMP_GENEXP) {
if (codegen_wrap_in_stopiteration_handler(c) < 0) {
Expand Down
Loading