commit f4507231e3f0cf8827cec5592571ce371c6813e8
author Victor Stinner <vstinner@python.org> Sat Dec 26 20:26:08 2020 +0100
committer GitHub <noreply@github.com> Sat Dec 26 20:26:08 2020 +0100
tree 1945e1cd6088d46c00f68f8a4a89eb35154ddf6c
parent 3bcc4ead3f66a58604b7ce87d14e909406c3b364

bpo-42745: finalize_interp_types() calls _PyType_Fini() (GH-23953)

Call _PyType_Fini() in subinterpreters.

Fix reference leaks in subinterpreters.

Objects/typeobject.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 43c499a..3498f0d 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();
+    }
 }
 
 

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index a03ca9a..ad32a06 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]);