Skip to content

[3.15] gh-156466: fix cleanup on error in codegen_setup_annotations_scope (#156473) #156498

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
iritkatriel wants to merge 1 commit into
base: 3.15
Choose a base branch
from
+16 −9
Open

[3.15] gh-156466: fix cleanup on error in codegen_setup_annotations_scope (#156473) #156498

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
25 changes: 16 additions & 9 deletions Python/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,16 +703,8 @@ codegen_enter_scope(compiler *c, identifier name, int scope_type,
}

static int
codegen_setup_annotations_scope(compiler *c, location loc,
void *key, PyObject *name)
codegen_emit_annotations_prologue(compiler *c, location loc)
{
_PyCompile_CodeUnitMetadata umd = {
.u_posonlyargcount = 1,
};
RETURN_IF_ERROR(
codegen_enter_scope(c, name, COMPILE_SCOPE_ANNOTATIONS,
key, loc.lineno, NULL, &umd));

// if .format > VALUE_WITH_FAKE_GLOBALS: raise NotImplementedError
PyObject *value_with_fake_globals = PyLong_FromLong(_Py_ANNOTATE_FORMAT_VALUE_WITH_FAKE_GLOBALS);
if (value_with_fake_globals == NULL) {
Expand All @@ -732,6 +724,21 @@ codegen_setup_annotations_scope(compiler *c, location loc,
return SUCCESS;
}

static int
codegen_setup_annotations_scope(compiler *c, location loc,
void *key, PyObject *name)
{
_PyCompile_CodeUnitMetadata umd = {
.u_posonlyargcount = 1,
};
RETURN_IF_ERROR(
codegen_enter_scope(c, name, COMPILE_SCOPE_ANNOTATIONS,
key, loc.lineno, NULL, &umd));

RETURN_IF_ERROR_IN_SCOPE(c, codegen_emit_annotations_prologue(c, loc));
return SUCCESS;
}

static int
codegen_leave_annotations_scope(compiler *c, location loc)
{
Expand Down
Loading