Skip to content
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

gh-113480: Check if the type attribute is really modified before label it modified #113481

Closed
wants to merge 2 commits into from
Closed

gh-113480: Check if the type attribute is really modified before label it modified #113481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1434d35
Check if the type attribute is really modified before label it
gaogaotiantian Dec 26, 2023
8493ba1
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 26, 2023
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-12-26-05-10-23.gh-issue-113480._ul8BY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Check if the type attribute is really modified before label it modified
10 changes: 9 additions & 1 deletion Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4960,8 +4960,16 @@ type_setattro(PyObject *self, PyObject *name, PyObject *value)
/* Will fail in _PyObject_GenericSetAttrWithDict. */
Py_INCREF(name);
}

// Get the global dict version of interpreter
// If the version does not change, that means we assigned the same value
// to the attribute, so the type is not modified

PyInterpreterState *interp = _PyInterpreterState_GET();
uint64_t prev_version = interp->dict_state.global_version;

res = _PyObject_GenericSetAttrWithDict((PyObject *)type, name, value, NULL);
if (res == 0) {
if (res == 0 && prev_version != interp->dict_state.global_version) {
/* Clear the VALID_VERSION flag of 'type' and all its
subclasses. This could possibly be unified with the
update_subclasses() recursion in update_slot(), but carefully:
Expand Down