Skip to content

[3.15] gh-156525: fix a few error path scope management bugs in symtable (GH-156526) #156532

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

Open
miss-islington wants to merge 1 commit into
base: 3.15
Choose a base branch
from
+19 −9
Open

[3.15] gh-156525: fix a few error path scope management bugs in symtable (GH-156526) #156532

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
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 VIST_SEQ_TAIL take an ASDL type as their second argument.
Expand Down
Loading