Skip to content

gh-94673: Always Finalize Static Builtin Types #95153

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

Merged
ericsnowcurrently merged 6 commits into from
Jul 25, 2022
Merged

gh-94673: Always Finalize Static Builtin Types #95153

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc0f56c
Add a note about skipping on subclasses.
ericsnowcurrently Jul 20, 2022
34c5d3b
Throw away the leaking subclasses.
ericsnowcurrently Jul 20, 2022
8d64d72
Factor out subclass_from_ref().
ericsnowcurrently Jul 22, 2022
fe8cce9
Handle MemoryError in remove_subclass().
ericsnowcurrently Jul 22, 2022
74d5af3
Call _PyTypes_FiniTypes() before _PyTypes_Fini().
ericsnowcurrently Jul 22, 2022
d91a0d6
Update Objects/typeobject.c
ericsnowcurrently Jul 25, 2022
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
Prev Previous commit
Next Next commit
Factor out subclass_from_ref().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jul 22, 2022
commit 8d64d72326a0633895e783d7a0d42e334b6750bf
37 changes: 23 additions & 14 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ lookup_maybe_method(PyObject *self, PyObject *attr, int *unbound);
static int
slot_tp_setattro(PyObject *self, PyObject *name, PyObject *value);

static inline PyTypeObject * subclass_from_ref(PyObject *ref);

/*
* finds the beginning of the docstring's introspection signature.
* if present, returns a pointer pointing to the first '('.
Expand Down Expand Up @@ -309,12 +311,11 @@ PyType_Modified(PyTypeObject *type)
Py_ssize_t i = 0;
PyObject *ref;
while (PyDict_Next(subclasses, &i, NULL, &ref)) {
assert(PyWeakref_CheckRef(ref));
PyObject *obj = PyWeakref_GET_OBJECT(ref);
if (obj == Py_None) {
PyTypeObject *subclass = subclass_from_ref(ref); // borrowed
if (subclass == NULL) {
continue;
}
PyType_Modified(_PyType_CAST(obj));
PyType_Modified(subclass);
}
}

Expand Down Expand Up @@ -4321,14 +4322,12 @@ _PyType_GetSubclasses(PyTypeObject *self)
Py_ssize_t i = 0;
PyObject *ref; // borrowed ref
while (PyDict_Next(subclasses, &i, NULL, &ref)) {
assert(PyWeakref_CheckRef(ref));
PyObject *obj = PyWeakref_GET_OBJECT(ref); // borrowed ref
if (obj == Py_None) {
PyTypeObject *subclass = subclass_from_ref(ref); // borrowed
if (subclass == NULL) {
continue;
}
assert(PyType_Check(obj));

if (PyList_Append(list, obj) < 0) {
if (PyList_Append(list, _PyObject_CAST(subclass)) < 0) {
Py_DECREF(list);
return NULL;
}
Expand Down Expand Up @@ -6725,6 +6724,19 @@ add_all_subclasses(PyTypeObject *type, PyObject *bases)
return res;
}

static inline PyTypeObject *
subclass_from_ref(PyObject *ref)
{
assert(PyWeakref_CheckRef(ref));
PyObject *obj = PyWeakref_GET_OBJECT(ref); // borrowed ref
assert(obj != NULL);
if (obj == Py_None) {
return NULL;
}
assert(PyType_Check(obj));
return _PyType_CAST(obj);
}

static void
remove_subclass(PyTypeObject *base, PyTypeObject *type)
{
Expand Down Expand Up @@ -8828,13 +8840,10 @@ recurse_down_subclasses(PyTypeObject *type, PyObject *attr_name,
Py_ssize_t i = 0;
PyObject *ref;
while (PyDict_Next(subclasses, &i, NULL, &ref)) {
assert(PyWeakref_CheckRef(ref));
PyObject *obj = PyWeakref_GET_OBJECT(ref);
assert(obj != NULL);
if (obj == Py_None) {
PyTypeObject *subclass = subclass_from_ref(ref); // borrowed
if (subclass == NULL) {
continue;
}
PyTypeObject *subclass = _PyType_CAST(obj);

/* Avoid recursing down into unaffected classes */
PyObject *dict = subclass->tp_dict;
Expand Down