Skip to content

gh-116767: fix crash on 'async with' with many context managers #118348

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
encukou merged 7 commits into from
May 1, 2024
Merged

gh-116767: fix crash on 'async with' with many context managers #118348

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de44492
gh-116767: fix crash on 'async with' with many context managers
iritkatriel Apr 27, 2024
058faa3
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 27, 2024
4e4328f
revert debug thing
iritkatriel Apr 27, 2024
42a752f
fix test
iritkatriel Apr 27, 2024
2e8aab2
fix other test
iritkatriel Apr 27, 2024
f29d7bf
increment CO_MAXBLOCKS
iritkatriel Apr 29, 2024
39d64f2
calculate once
iritkatriel Apr 29, 2024
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
calculate once
  • Loading branch information
@iritkatriel
iritkatriel committed Apr 29, 2024
commit 39d64f2e8fe1e46a18eaf2d225c7bb0bcee4175e
5 changes: 3 additions & 2 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2237,7 +2237,8 @@ compiler_function_body(struct compiler *c, stmt_ty s, int is_async, Py_ssize_t f

NEW_JUMP_TARGET_LABEL(c, start);
USE_LABEL(c, start);
if (c->u->u_ste->ste_coroutine || c->u->u_ste->ste_generator) {
bool add_stopiteration_handler = c->u->u_ste->ste_coroutine || c->u->u_ste->ste_generator;
if (add_stopiteration_handler) {
/* wrap_in_stopiteration_handler will push a block, so we need to account for that */
RETURN_IF_ERROR(
compiler_push_fblock(c, NO_LOCATION, STOP_ITERATION,
Expand All @@ -2247,7 +2248,7 @@ compiler_function_body(struct compiler *c, stmt_ty s, int is_async, Py_ssize_t f
for (Py_ssize_t i = first_instr; i < asdl_seq_LEN(body); i++) {
VISIT_IN_SCOPE(c, stmt, (stmt_ty)asdl_seq_GET(body, i));
}
if (c->u->u_ste->ste_coroutine || c->u->u_ste->ste_generator) {
if (add_stopiteration_handler) {
if (wrap_in_stopiteration_handler(c) < 0) {
compiler_exit_scope(c);
return ERROR;
Expand Down