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

gh-121272: set ste_coroutine during symtable construction (#121297)

Browse source 
compiler no longer modifies the symtable after this.
This commit is contained in:
Irit Katriel 2024-07-03 10:18:34 +01:00 • committed by GitHub
parent 51c4a324c0
commit 93156880ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/compile.c
View file

@ -3059,7 +3059,7 @@ compiler_async_for(struct compiler *c, stmt_ty s)
{ {
location loc = LOC(s); location loc = LOC(s);
if (IS_TOP_LEVEL_AWAIT(c)){ if (IS_TOP_LEVEL_AWAIT(c)){
c->u->u_ste->ste_coroutine = 1; assert(c->u->u_ste->ste_coroutine == 1);
} else if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) { } else if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) {
return compiler_error(c, loc, "'async for' outside async function"); return compiler_error(c, loc, "'async for' outside async function");
} }
@ -5782,7 +5782,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
co = optimize_and_assemble(c, 1); co = optimize_and_assemble(c, 1);
compiler_exit_scope(c); compiler_exit_scope(c);
if (is_top_level_await && is_async_generator){ if (is_top_level_await && is_async_generator){
c->u->u_ste->ste_coroutine = 1; assert(c->u->u_ste->ste_coroutine == 1);
} }
if (co == NULL) { if (co == NULL) {
goto error; goto error;
@ -5926,7 +5926,7 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
assert(s->kind == AsyncWith_kind); assert(s->kind == AsyncWith_kind);
if (IS_TOP_LEVEL_AWAIT(c)){ if (IS_TOP_LEVEL_AWAIT(c)){
c->u->u_ste->ste_coroutine = 1; assert(c->u->u_ste->ste_coroutine == 1);
} else if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION){ } else if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION){
return compiler_error(c, loc, "'async with' outside async function"); return compiler_error(c, loc, "'async with' outside async function");
} }

12
Python/symtable.c
View file

@ -1681,6 +1681,16 @@ check_import_from(struct symtable *st, stmt_ty s)
return 1; return 1;
} }
static void
maybe_set_ste_coroutine_for_module(struct symtable *st, stmt_ty s)
{
if ((st->st_future->ff_features & PyCF_ALLOW_TOP_LEVEL_AWAIT) &&
(st->st_cur->ste_type == ModuleBlock))
{
st->st_cur->ste_coroutine = 1;
}
}
static int static int
symtable_visit_stmt(struct symtable *st, stmt_ty s) symtable_visit_stmt(struct symtable *st, stmt_ty s)
{ {
@ -2074,10 +2084,12 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
break; break;
} }
case AsyncWith_kind: case AsyncWith_kind:
maybe_set_ste_coroutine_for_module(st, s);
VISIT_SEQ(st, withitem, s->v.AsyncWith.items); VISIT_SEQ(st, withitem, s->v.AsyncWith.items);
VISIT_SEQ(st, stmt, s->v.AsyncWith.body); VISIT_SEQ(st, stmt, s->v.AsyncWith.body);
break; break;
case AsyncFor_kind: case AsyncFor_kind:
maybe_set_ste_coroutine_for_module(st, s);
VISIT(st, expr, s->v.AsyncFor.target); VISIT(st, expr, s->v.AsyncFor.target);
VISIT(st, expr, s->v.AsyncFor.iter); VISIT(st, expr, s->v.AsyncFor.iter);
VISIT_SEQ(st, stmt, s->v.AsyncFor.body); VISIT_SEQ(st, stmt, s->v.AsyncFor.body);