mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-22 00:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-43495 : Push missing frame block in compile.c (GH-24865)

Browse source
This commit is contained in:
tomKPZ 2021-04-07 07:43:45 -07:00 • committed by GitHub
parent e35dd556e1
commit 7a7ba3d343
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Python/compile.c
View file

@ -116,7 +116,8 @@ compiler IR.
*/ */
enum fblocktype { WHILE_LOOP, FOR_LOOP, TRY_EXCEPT, FINALLY_TRY, FINALLY_END, enum fblocktype { WHILE_LOOP, FOR_LOOP, TRY_EXCEPT, FINALLY_TRY, FINALLY_END,
WITH, ASYNC_WITH, HANDLER_CLEANUP, POP_VALUE, EXCEPTION_HANDLER }; WITH, ASYNC_WITH, HANDLER_CLEANUP, POP_VALUE, EXCEPTION_HANDLER,
ASYNC_COMPREHENSION_GENERATOR };
struct fblockinfo { struct fblockinfo {
enum fblocktype fb_type; enum fblocktype fb_type;
@ -1700,6 +1701,7 @@ compiler_unwind_fblock(struct compiler *c, struct fblockinfo *info,
switch (info->fb_type) { switch (info->fb_type) {
case WHILE_LOOP: case WHILE_LOOP:
case EXCEPTION_HANDLER: case EXCEPTION_HANDLER:
case ASYNC_COMPREHENSION_GENERATOR:
return 1; return 1;
case FOR_LOOP: case FOR_LOOP:
@ -4573,6 +4575,11 @@ compiler_async_comprehension_generator(struct compiler *c,
} }
compiler_use_next_block(c, start); compiler_use_next_block(c, start);
/* Runtime will push a block here, so we need to account for that */
if (!compiler_push_fblock(c, ASYNC_COMPREHENSION_GENERATOR, start,
NULL, NULL)) {
return 0;
}
ADDOP_JUMP(c, SETUP_FINALLY, except); ADDOP_JUMP(c, SETUP_FINALLY, except);
ADDOP(c, GET_ANEXT); ADDOP(c, GET_ANEXT);
@ -4627,6 +4634,8 @@ compiler_async_comprehension_generator(struct compiler *c,
compiler_use_next_block(c, if_cleanup); compiler_use_next_block(c, if_cleanup);
ADDOP_JUMP(c, JUMP_ABSOLUTE, start); ADDOP_JUMP(c, JUMP_ABSOLUTE, start);
compiler_pop_fblock(c, ASYNC_COMPREHENSION_GENERATOR, start);
compiler_use_next_block(c, except); compiler_use_next_block(c, except);
ADDOP(c, END_ASYNC_FOR); ADDOP(c, END_ASYNC_FOR);