Skip to content

[pull] main from python:main #1420

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
pull merged 2 commits into from
Aug 28, 2026
Merged

[pull] main from python:main #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
932822c
gh-156525: fix a few error path scope management bugs in symtable (#1…
iritkatriel Aug 28, 2026
683ef40
gh-156466: fix cleanup on error in codegen_class_body (#156507)
iritkatriel Aug 28, 2026
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
50 changes: 24 additions & 26 deletions Python/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,19 +310,23 @@ codegen_addop_load_const(compiler *c, location loc, PyObject *o)
#define ADDOP_LOAD_CONST_IN_SCOPE(C, LOC, O) \
RETURN_IF_ERROR_IN_SCOPE((C), codegen_addop_load_const((C), (LOC), (O)))

static int
codegen_addop_load_const_new(compiler *c, location loc, PyObject *o)
{
if (o == NULL) {
return ERROR;
}
int ret = codegen_addop_load_const(c, loc, o);
Py_DECREF(o);
return ret;
}

/* Same as ADDOP_LOAD_CONST, but steals a reference. */
#define ADDOP_LOAD_CONST_NEW(C, LOC, O) \
do { \
PyObject *__new_const = (O); \
if (__new_const == NULL) { \
return ERROR; \
} \
if (codegen_addop_load_const((C), (LOC), __new_const) < 0) { \
Py_DECREF(__new_const); \
return ERROR; \
} \
Py_DECREF(__new_const); \
} while (0)
#define ADDOP_LOAD_CONST_NEW(C, LOC, O) \
RETURN_IF_ERROR(codegen_addop_load_const_new((C), (LOC), (O)))

#define ADDOP_LOAD_CONST_NEW_IN_SCOPE(C, LOC, O) \
RETURN_IF_ERROR_IN_SCOPE((C), codegen_addop_load_const_new((C), (LOC), (O)))

static int
codegen_addop_o(compiler *c, location loc,
Expand Down Expand Up @@ -1613,16 +1617,16 @@ codegen_class_body(compiler *c, stmt_ty s, int firstlineno)
RETURN_IF_ERROR_IN_SCOPE(c, codegen_nameop(c, loc, &_Py_ID(__name__), Load));
/* ... and store it as __module__ */
RETURN_IF_ERROR_IN_SCOPE(c, codegen_nameop(c, loc, &_Py_ID(__module__), Store));
ADDOP_LOAD_CONST(c, loc, QUALNAME(c));
ADDOP_LOAD_CONST_IN_SCOPE(c, loc, QUALNAME(c));
RETURN_IF_ERROR_IN_SCOPE(c, codegen_nameop(c, loc, &_Py_ID(__qualname__), Store));
ADDOP_LOAD_CONST_NEW(c, loc, PyLong_FromLong(METADATA(c)->u_firstlineno));
ADDOP_LOAD_CONST_NEW_IN_SCOPE(c, loc, PyLong_FromLong(METADATA(c)->u_firstlineno));
RETURN_IF_ERROR_IN_SCOPE(c, codegen_nameop(c, loc, &_Py_ID(__firstlineno__), Store));
asdl_type_param_seq *type_params = s->v.ClassDef.type_params;
if (asdl_seq_LEN(type_params) > 0) {
RETURN_IF_ERROR_IN_SCOPE(c, codegen_set_type_params_in_class(c, loc));
}
if (SYMTABLE_ENTRY(c)->ste_needs_classdict) {
ADDOP(c, loc, LOAD_LOCALS);
ADDOP_IN_SCOPE(c, loc, LOAD_LOCALS);

// We can't use codegen_nameop here because we need to generate a
// STORE_DEREF in a class namespace, and codegen_nameop() won't do
Expand All @@ -1635,13 +1639,7 @@ codegen_class_body(compiler *c, stmt_ty s, int firstlineno)
}
/* compile the body proper */
RETURN_IF_ERROR_IN_SCOPE(c, codegen_body(c, loc, s->v.ClassDef.body, false));
PyObject *static_attributes = _PyCompile_StaticAttributesAsTuple(c);
if (static_attributes == NULL) {
_PyCompile_ExitScope(c);
return ERROR;
}
ADDOP_LOAD_CONST(c, NO_LOCATION, static_attributes);
Py_CLEAR(static_attributes);
ADDOP_LOAD_CONST_NEW_IN_SCOPE(c, NO_LOCATION, _PyCompile_StaticAttributesAsTuple(c));
RETURN_IF_ERROR_IN_SCOPE(
c, codegen_nameop(c, NO_LOCATION, &_Py_ID(__static_attributes__), Store));
/* The following code is artificial */
Expand All @@ -1650,7 +1648,7 @@ codegen_class_body(compiler *c, stmt_ty s, int firstlineno)
/* Store __classdictcell__ into class namespace */
int i = _PyCompile_LookupCellvar(c, &_Py_ID(__classdict__));
RETURN_IF_ERROR_IN_SCOPE(c, i);
ADDOP_I(c, NO_LOCATION, LOAD_CLOSURE, i);
ADDOP_I_IN_SCOPE(c, NO_LOCATION, LOAD_CLOSURE, i);
RETURN_IF_ERROR_IN_SCOPE(
c, codegen_nameop(c, NO_LOCATION, &_Py_ID(__classdictcell__), Store));
}
Expand All @@ -1659,14 +1657,14 @@ codegen_class_body(compiler *c, stmt_ty s, int firstlineno)
/* Store __classcell__ into class namespace & return it */
int i = _PyCompile_LookupCellvar(c, &_Py_ID(__class__));
RETURN_IF_ERROR_IN_SCOPE(c, i);
ADDOP_I(c, NO_LOCATION, LOAD_CLOSURE, i);
ADDOP_I(c, NO_LOCATION, COPY, 1);
ADDOP_I_IN_SCOPE(c, NO_LOCATION, LOAD_CLOSURE, i);
ADDOP_I_IN_SCOPE(c, NO_LOCATION, COPY, 1);
RETURN_IF_ERROR_IN_SCOPE(
c, codegen_nameop(c, NO_LOCATION, &_Py_ID(__classcell__), Store));
}
else {
/* No methods referenced __class__, so just return None */
ADDOP_LOAD_CONST(c, NO_LOCATION, Py_None);
ADDOP_LOAD_CONST_IN_SCOPE(c, NO_LOCATION, Py_None);
}
ADDOP_IN_SCOPE(c, NO_LOCATION, RETURN_VALUE);
/* create the code object */
Expand Down
28 changes: 19 additions & 9 deletions Python/symtable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,6 +1455,7 @@ symtable_enter_existing_block(struct symtable *st, PySTEntryObject* ste, bool ad

if (add_to_children && prev) {
if (PyList_Append(prev->ste_children, (PyObject *)ste) < 0) {
symtable_exit_block(st);
return 0;
}
}
Expand All @@ -1466,21 +1467,27 @@ symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
void *ast, _Py_SourceLocation loc)
{
PySTEntryObject *ste = ste_new(st, name, block, ast, loc);
if (ste == NULL)
if (ste == NULL) {
return 0;
}
int result = symtable_enter_existing_block(st, ste, /* add_to_children */true);
Py_DECREF(ste);
if (result == 0) {
return 0;
}
if (block == AnnotationBlock || block == TypeVariableBlock || block == TypeAliasBlock) {
_Py_DECLARE_STR(format, ".format");
// We need to insert code that reads this "parameter" to the function.
if (!symtable_add_def(st, &_Py_STR(format), DEF_PARAM, loc)) {
symtable_exit_block(st);
return 0;
}
if (!symtable_add_def(st, &_Py_STR(format), USE, loc)) {
symtable_exit_block(st);
return 0;
}
}
return result;
return 1;
}

static long
Expand Down Expand Up @@ -1676,41 +1683,44 @@ symtable_enter_type_param_block(struct symtable *st, identifier name,
if (current_type == ClassBlock) {
st->st_cur->ste_can_see_class_scope = 1;
if (!symtable_add_def(st, &_Py_ID(__classdict__), USE, loc)) {
return 0;
goto error;
}
}
if (kind == ClassDef_kind) {
_Py_DECLARE_STR(type_params, ".type_params");
// It gets "set" when we create the type params tuple and
// "used" when we build up the bases.
if (!symtable_add_def(st, &_Py_STR(type_params), DEF_LOCAL, loc)) {
return 0;
goto error;
}
if (!symtable_add_def(st, &_Py_STR(type_params), USE, loc)) {
return 0;
goto error;
}
// This is used for setting the generic base
_Py_DECLARE_STR(generic_base, ".generic_base");
if (!symtable_add_def(st, &_Py_STR(generic_base), DEF_LOCAL, loc)) {
return 0;
goto error;
}
if (!symtable_add_def(st, &_Py_STR(generic_base), USE, loc)) {
return 0;
goto error;
}
}
if (has_defaults) {
_Py_DECLARE_STR(defaults, ".defaults");
if (!symtable_add_def(st, &_Py_STR(defaults), DEF_PARAM, loc)) {
return 0;
goto error;
}
}
if (has_kwdefaults) {
_Py_DECLARE_STR(kwdefaults, ".kwdefaults");
if (!symtable_add_def(st, &_Py_STR(kwdefaults), DEF_PARAM, loc)) {
return 0;
goto error;
}
}
return 1;
error:
symtable_exit_block(st);
return 0;
}

/* VISIT, VISIT_SEQ and VISIT_SEQ_TAIL take an ASDL type as their second argument.
Expand Down
Loading