Make sure that type cache is fully cleared in _PyType_Fini.

markshannon · markshannon · commit 68da204fbc30 · 2021-08-15T21:51:35.000+01:00
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -298,7 +298,10 @@ _PyType_Fini(PyInterpreterState *interp)
 {
     struct type_cache *cache = &interp->type_cache;
     for (Py_ssize_t i = 0; i < (1 << MCACHE_SIZE_EXP); i++) {
-        Py_DECREF(cache->hashtable[i].name);
+        struct type_cache_entry *entry = &cache->hashtable[i];
+        entry->version = 0;
+        Py_CLEAR(entry->name);
+        entry->value = NULL;
     }
     if (_Py_IsMainInterpreter(interp)) {
         clear_slotdefs();

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,10 @@ _PyType_Fini(PyInterpreterState *interp)`
`298`	`298`	`{`
`299`	`299`	`struct type_cache *cache = &interp->type_cache;`
`300`	`300`	`for (Py_ssize_t i = 0; i < (1 << MCACHE_SIZE_EXP); i++) {`
`301`		`- Py_DECREF(cache->hashtable[i].name);`
	`301`	`+ struct type_cache_entry *entry = &cache->hashtable[i];`
	`302`	`+ entry->version = 0;`
	`303`	`+ Py_CLEAR(entry->name);`
	`304`	`+ entry->value = NULL;`
`302`	`305`	`}`
`303`	`306`	`if (_Py_IsMainInterpreter(interp)) {`
`304`	`307`	`clear_slotdefs();`