Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions Lib/test/test_syntax.py
Original file line number Diff line number Diff line change
Expand Up @@ -2697,6 +2697,21 @@ def test_syntax_error_on_deeply_nested_blocks(self):
"""
self._check_error(source, "too many statically nested blocks")

@support.cpython_only
def test_nested_inlined_comprehensions_block_limit(self):
# Each inlined comprehension with locals emits SETUP_FINALLY, which
# must count toward CO_MAXBLOCKS (gh-156091).
def src(depth):
e = "i for i in r"
for _ in range(depth - 1):
e = "[" + e + "] for i in r"
return "x = [" + e + "]"

CO_MAXBLOCKS = 21
compile(src(CO_MAXBLOCKS), "<testcase>", "exec")
self._check_error(src(CO_MAXBLOCKS + 1),
"too many statically nested blocks")

@support.cpython_only
def test_error_on_parser_stack_overflow(self):
source = "-" * 100000 + "4"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix a crash when compiling deeply nested inlined list, set, or dict
comprehensions. A :exc:`SyntaxError` is now raised when the nesting exceeds
the compiler's static block limit.
10 changes: 7 additions & 3 deletions Python/compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ compiler IR.
enum fblocktype { WHILE_LOOP, FOR_LOOP, TRY_EXCEPT, FINALLY_TRY, FINALLY_END,
WITH, ASYNC_WITH, HANDLER_CLEANUP, POP_VALUE, EXCEPTION_HANDLER,
EXCEPTION_GROUP_HANDLER, ASYNC_COMPREHENSION_GENERATOR,
STOP_ITERATION };
INLINED_COMPREHENSION, STOP_ITERATION };

struct fblockinfo {
enum fblocktype fb_type;
Expand Down Expand Up @@ -1523,6 +1523,7 @@ compiler_unwind_fblock(struct compiler *c, location *ploc,
case EXCEPTION_HANDLER:
case EXCEPTION_GROUP_HANDLER:
case ASYNC_COMPREHENSION_GENERATOR:
case INLINED_COMPREHENSION:
case STOP_ITERATION:
return SUCCESS;

Expand Down Expand Up @@ -5714,8 +5715,10 @@ push_inlined_comprehension_state(struct compiler *c, location loc,
NEW_JUMP_TARGET_LABEL(c, end);
state->end = end;

// no need to push an fblock for this "virtual" try/finally; there can't
// be return/continue/break inside a comprehension
// Count against CO_MAXBLOCKS: SETUP_FINALLY consumes an except-stack
// slot even though return/continue/break cannot appear here.
RETURN_IF_ERROR(compiler_push_fblock(c, loc, INLINED_COMPREHENSION,
cleanup, NO_LABEL, NULL));
ADDOP_JUMP(c, loc, SETUP_FINALLY, cleanup);
}

Expand Down Expand Up @@ -5761,6 +5764,7 @@ pop_inlined_comprehension_state(struct compiler *c, location loc,
}
if (state.pushed_locals) {
ADDOP(c, NO_LOCATION, POP_BLOCK);
compiler_pop_fblock(c, INLINED_COMPREHENSION, state.cleanup);
ADDOP_JUMP(c, NO_LOCATION, JUMP_NO_INTERRUPT, state.end);

// cleanup from an exception inside the comprehension
Expand Down
Loading