_PyStaticType_Dealloc() -> _PyStaticType_FiniBuiltin()

Author: ericsnowcurrently

Include/internal/pycore_typeobject.h

@@ -154,7 +154,7 @@ _PyType_GetModuleState(PyTypeObject *type)
 extern int _PyStaticType_InitBuiltin(PyInterpreterState *, PyTypeObject *type);
 extern static_builtin_state * _PyStaticType_GetState(PyInterpreterState *, PyTypeObject *);
 extern void _PyStaticType_ClearWeakRefs(PyInterpreterState *, PyTypeObject *type);
-extern void _PyStaticType_Dealloc(PyInterpreterState *, PyTypeObject *);
+extern void _PyStaticType_FiniBuiltin(PyInterpreterState *, PyTypeObject *);
 
 // Export for 'math' shared extension, used via _PyType_IsReady() static inline
 // function

Objects/exceptions.c

@@ -3725,7 +3725,7 @@ _PyExc_FiniTypes(PyInterpreterState *interp)
 {
     for (Py_ssize_t i=Py_ARRAY_LENGTH(static_exceptions) - 1; i >= 0; i--) {
         PyTypeObject *exc = static_exceptions[i].exc;
-        _PyStaticType_Dealloc(interp, exc);
+        _PyStaticType_FiniBuiltin(interp, exc);
     }
 }
 

Objects/object.c

@@ -2355,7 +2355,7 @@ _PyTypes_FiniTypes(PyInterpreterState *interp)
     // their base classes.
     for (Py_ssize_t i=Py_ARRAY_LENGTH(static_types)-1; i>=0; i--) {
         PyTypeObject *type = static_types[i];
-        _PyStaticType_Dealloc(interp, type);
+        _PyStaticType_FiniBuiltin(interp, type);
     }
 }
 

Objects/structseq.c

@@ -718,7 +718,7 @@ _PyStructSequence_FiniBuiltin(PyInterpreterState *interp, PyTypeObject *type)
         return;
     }
 
-    _PyStaticType_Dealloc(interp, type);
+    _PyStaticType_FiniBuiltin(interp, type);
 
     if (_Py_IsMainInterpreter(interp)) {
         // Undo _PyStructSequence_InitBuiltinWithFlags().

Objects/typeobject.c

@@ -5686,7 +5686,7 @@ clear_static_type_objects(PyInterpreterState *interp, PyTypeObject *type)
 }
 
 void
-_PyStaticType_Dealloc(PyInterpreterState *interp, PyTypeObject *type)
+_PyStaticType_FiniBuiltin(PyInterpreterState *interp, PyTypeObject *type)
 {
     assert(type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN);
     assert(_Py_IsImmortal((PyObject *)type));

Objects/unicodeobject.c

@@ -15520,9 +15520,9 @@ unicode_is_finalizing(void)
 void
 _PyUnicode_FiniTypes(PyInterpreterState *interp)
 {
-    _PyStaticType_Dealloc(interp, &EncodingMapType);
-    _PyStaticType_Dealloc(interp, &PyFieldNameIter_Type);
-    _PyStaticType_Dealloc(interp, &PyFormatterIter_Type);
+    _PyStaticType_FiniBuiltin(interp, &EncodingMapType);
+    _PyStaticType_FiniBuiltin(interp, &PyFieldNameIter_Type);
+    _PyStaticType_FiniBuiltin(interp, &PyFormatterIter_Type);
 }
 
 

Python/crossinterp_exceptions.h

@@ -90,6 +90,6 @@ static void
 fini_exceptions(PyInterpreterState *interp)
 {
     // Likewise with _fini_not_shareable_error_type().
-    _PyStaticType_Dealloc(interp, &_PyExc_InterpreterNotFoundError);
-    _PyStaticType_Dealloc(interp, &_PyExc_InterpreterError);
+    _PyStaticType_FiniBuiltin(interp, &_PyExc_InterpreterNotFoundError);
+    _PyStaticType_FiniBuiltin(interp, &_PyExc_InterpreterError);
 }