Skip to content

[3.14] gh-156466: fix cleanup on error in codegen_leave_annotations_scope #156522

新建议题

Have a question about this project? 注册 for a free GitHub account to open an issue and contact its maintainers and the community.

注册 for GitHub

By clicking “注册 for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? 登录 to your account

Open
iritkatriel wants to merge 2 commits into
base: 3.14
Choose a base branch
from
+4 −4
Open

[3.14] gh-156466: fix cleanup on error in codegen_leave_annotations_scope #156522

Changes from all commits
提交
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1fb679
[3.14] gh-156466: fix cleanup on error in codegen_leave_annotations_s…
iritkatriel Aug 28, 2026
f0487a6
Merge branch '3.14' into backport-8e0159b-3.14
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
8 changes: 4 additions & 4 deletions Python/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,10 +696,11 @@ codegen_setup_annotations_scope(compiler *c, location loc,
}

static int
codegen_leave_annotations_scope(compiler *c, location loc)
codegen_finish_annotations_scope(compiler *c, location loc)
{
ADDOP_IN_SCOPE(c, loc, RETURN_VALUE);
PyCodeObject *co = _PyCompile_OptimizeAndAssemble(c, 1);
_PyCompile_ExitScope(c);
if (co == NULL) {
return ERROR;
}
Expand Down Expand Up @@ -733,7 +734,6 @@ codegen_leave_annotations_scope(compiler *c, location loc)
}
Py_SETREF(co->co_localsplusnames, new_names);

_PyCompile_ExitScope(c);
int ret = codegen_make_closure(c, loc, co, 0);
Py_DECREF(co);
RETURN_IF_ERROR(ret);
Expand Down Expand Up @@ -833,7 +833,7 @@ codegen_process_deferred_annotations(compiler *c, location loc)
Py_DECREF(deferred_anno);
Py_DECREF(conditional_annotation_indices);

RETURN_IF_ERROR(codegen_leave_annotations_scope(c, loc));
RETURN_IF_ERROR(codegen_finish_annotations_scope(c, loc));
RETURN_IF_ERROR(codegen_nameop(
c, loc,
ste->ste_type == ClassBlock ? &_Py_ID(__annotate_func__) : &_Py_ID(__annotate__),
Expand Down Expand Up @@ -1139,7 +1139,7 @@ codegen_function_annotations(compiler *c, location loc,
c, codegen_annotations_in_scope(c, loc, args, returns, &annotations_len)
);
ADDOP_I_IN_SCOPE(c, loc, BUILD_MAP, annotations_len);
RETURN_IF_ERROR(codegen_leave_annotations_scope(c, loc));
RETURN_IF_ERROR(codegen_finish_annotations_scope(c, loc));
return MAKE_FUNCTION_ANNOTATE;
}
else {
Expand Down
Loading