gh-124019: do not call codegen_annotations_in_scope if there are no annotations (#124020)

This commit is contained in:
Irit Katriel 2024-09-12 20:24:15 +01:00 committed by GitHub
parent a53812df12
commit 6e06e01881
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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;
}