Skip to content

gh-124013: remove _PyCompile_IsTopLevelAwait #124014

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
merged 1 commit into from
Sep 12, 2024
Merged

gh-124013: remove _PyCompile_IsTopLevelAwait #124014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions Include/internal/pycore_compile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,6 @@ PyObject *_PyCompile_Qualname(struct _PyCompiler *c);
_PyCompile_CodeUnitMetadata *_PyCompile_Metadata(struct _PyCompiler *c);
PyObject *_PyCompile_StaticAttributesAsTuple(struct _PyCompiler *c);

#ifndef NDEBUG
int _PyCompile_IsTopLevelAwait(struct _PyCompiler *c);
#endif

struct symtable *_PyCompile_Symtable(struct _PyCompiler *c);
PySTEntryObject *_PyCompile_SymtableEntry(struct _PyCompiler *c);

Expand Down
16 changes: 0 additions & 16 deletions Python/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
struct _PyCompiler;
typedef struct _PyCompiler compiler;

#define IS_TOP_LEVEL_AWAIT(C) _PyCompile_IsTopLevelAwait(C)
#define INSTR_SEQUENCE(C) _PyCompile_InstrSequence(C)
#define FUTURE_FEATURES(C) _PyCompile_FutureFeatures(C)
#define SYMTABLE(C) _PyCompile_Symtable(C)
Expand Down Expand Up @@ -4497,10 +4496,6 @@ codegen_comprehension(compiler *c, expr_ty e, int type,
PyCodeObject *co = NULL;
_PyCompile_InlinedComprehensionState inline_state = {NULL, NULL, NULL, NO_LABEL};
comprehension_ty outermost;
#ifndef NDEBUG
int scope_type = SCOPE_TYPE(c);
int is_top_level_await = IS_TOP_LEVEL_AWAIT(c);
#endif
PySTEntryObject *entry = _PySymtable_Lookup(SYMTABLE(c), (void *)e);
if (entry == NULL) {
goto error;
Expand Down Expand Up @@ -4531,12 +4526,6 @@ codegen_comprehension(compiler *c, expr_ty e, int type,
}
Py_CLEAR(entry);

assert (!is_async_comprehension ||
type == COMP_GENEXP ||
scope_type == COMPILE_SCOPE_ASYNC_FUNCTION ||
scope_type == COMPILE_SCOPE_COMPREHENSION ||
is_top_level_await);

if (type != COMP_GENEXP) {
int op;
switch (type) {
Expand Down Expand Up @@ -4961,11 +4950,6 @@ codegen_visit_expr(compiler *c, expr_ty e)
ADD_YIELD_FROM(c, loc, 0);
break;
case Await_kind:
assert(IS_TOP_LEVEL_AWAIT(c) || (_PyST_IsFunctionLike(SYMTABLE_ENTRY(c)) && (
SCOPE_TYPE(c) == COMPILE_SCOPE_ASYNC_FUNCTION ||
SCOPE_TYPE(c) == COMPILE_SCOPE_COMPREHENSION
)));

VISIT(c, expr, e->v.Await.value);
ADDOP_I(c, loc, GET_AWAITABLE, 0);
ADDOP_LOAD_CONST(c, loc, Py_None);
Expand Down
9 changes: 0 additions & 9 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,15 +1242,6 @@ _PyCompile_Metadata(compiler *c)
return &c->u->u_metadata;
}

#ifndef NDEBUG
int
_PyCompile_IsTopLevelAwait(compiler *c)
{
return c->c_flags.cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT &&
c->u->u_ste->ste_type == ModuleBlock;
}
#endif

// Merge *obj* with constant cache, without recursion.
int
_PyCompile_ConstCacheMergeOne(PyObject *const_cache, PyObject **obj)
Expand Down
Loading