https://github.com/python/cpython/commit/6e06e01881dcffbeef5baac0c112ffb14cfa0b27
commit: 6e06e01881dcffbeef5baac0c112ffb14cfa0b27
branch: main
author: Irit Katriel <[email protected]>
committer: iritkatriel <[email protected]>
date: 2024-09-12T20:24:15+01:00
summary:
gh-124019: do not call codegen_annotations_in_scope if there are no annotations
(#124020)
files:
M Python/codegen.c
diff --git a/Python/codegen.c b/Python/codegen.c
index 9ce4e1fb1f6c92..2ca5db1fc6ad34 100644
--- a/Python/codegen.c
+++ b/Python/codegen.c
@@ -1002,26 +1002,22 @@ codegen_annotations(compiler *c, location loc,
PySTEntryObject *ste;
RETURN_IF_ERROR(_PySymtable_LookupOptional(SYMTABLE(c), args, &ste));
assert(ste != NULL);
- bool annotations_used = ste->ste_annotations_used;
- int err = annotations_used ?
- codegen_setup_annotations_scope(c, loc, (void *)args, ste->ste_name) :
SUCCESS;
- Py_DECREF(ste);
- RETURN_IF_ERROR(err);
-
- if (codegen_annotations_in_scope(c, loc, args, returns, &annotations_len)
< 0) {
- if (annotations_used) {
- _PyCompile_ExitScope(c);
- }
- return ERROR;
- }
-
- if (annotations_used) {
+ if (ste->ste_annotations_used) {
+ int err = codegen_setup_annotations_scope(c, loc, (void *)args,
ste->ste_name);
+ Py_DECREF(ste);
+ RETURN_IF_ERROR(err);
+ RETURN_IF_ERROR_IN_SCOPE(
+ c, codegen_annotations_in_scope(c, loc, args, returns,
&annotations_len)
+ );
RETURN_IF_ERROR(
codegen_leave_annotations_scope(c, loc, annotations_len)
);
return MAKE_FUNCTION_ANNOTATE;
}
+ else {
+ Py_DECREF(ste);
+ }
return 0;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
