[Python-checkins] bpo-42745: finalize_interp_types() calls _PyType_Fini() (GH-23953)
vstinner
webhook-mailer at python.org
Sat Dec 26 14:26:20 EST 2020
https://github.com/python/cpython/commit/f4507231e3f0cf8827cec5592571ce371c6813e8
commit: f4507231e3f0cf8827cec5592571ce371c6813e8
branch: master
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2020-12-26T20:26:08+01:00
summary:
bpo-42745: finalize_interp_types() calls _PyType_Fini() (GH-23953)
Call _PyType_Fini() in subinterpreters.
Fix reference leaks in subinterpreters.
files:
M Objects/typeobject.c
M Objects/unicodeobject.c
M Python/pylifecycle.c
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 43c499a04524f..3498f0d484e01 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -286,7 +286,9 @@ void
_PyType_Fini(PyThreadState *tstate)
{
_PyType_ClearCache(&tstate->interp->type_cache);
- clear_slotdefs();
+ if (_Py_IsMainInterpreter(tstate)) {
+ clear_slotdefs();
+ }
}
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index a03ca9a10d152..ad32a062d4854 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2359,10 +2359,9 @@ _PyUnicode_FromId(_Py_Identifier *id)
static void
-unicode_clear_identifiers(PyThreadState *tstate)
+unicode_clear_identifiers(struct _Py_unicode_state *state)
{
- PyInterpreterState *interp = _PyInterpreterState_GET();
- struct _Py_unicode_ids *ids = &interp->unicode.ids;
+ struct _Py_unicode_ids *ids = &state->ids;
for (Py_ssize_t i=0; i < ids->size; i++) {
Py_XDECREF(ids->array[i]);
}
@@ -16243,7 +16242,7 @@ _PyUnicode_Fini(PyThreadState *tstate)
_PyUnicode_FiniEncodings(&state->fs_codec);
- unicode_clear_identifiers(tstate);
+ unicode_clear_identifiers(state);
for (Py_ssize_t i = 0; i < 256; i++) {
Py_CLEAR(state->latin1[i]);
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index ccbacb481947c..9828dffad5c63 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1573,6 +1573,7 @@ finalize_interp_types(PyThreadState *tstate)
_PyFrame_Fini(tstate);
_PyAsyncGen_Fini(tstate);
_PyContext_Fini(tstate);
+ _PyType_Fini(tstate);
// Call _PyUnicode_ClearInterned() before _PyDict_Fini() since it uses
// a dict internally.
_PyUnicode_ClearInterned(tstate);
@@ -1751,9 +1752,6 @@ Py_FinalizeEx(void)
/* Destroy the database used by _PyImport_{Fixup,Find}Extension */
_PyImport_Fini();
- /* Cleanup typeobject.c's internal caches. */
- _PyType_Fini(tstate);
-
/* unload faulthandler module */
_PyFaulthandler_Fini();
More information about the Python-checkins
mailing list