_PyStaticType_Dealloc() -> _PyStaticType_FiniBuiltin()

ericsnowcurrently · ericsnowcurrently · commit 1e3005d18745 · 2024-05-31T14:45:04.000-06:00
diff --git a/Include/internal/pycore_typeobject.h b/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
diff --git a/Objects/exceptions.c b/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);
     }
 }
 
diff --git a/Objects/object.c b/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);
     }
 }
 
diff --git a/Objects/structseq.c b/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().
diff --git a/Objects/typeobject.c b/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));
diff --git a/Objects/unicodeobject.c b/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);
 }
 
 
diff --git a/Python/crossinterp_exceptions.h b/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);
 }

Original file line number	Diff line number	Diff line change
`@@ -3725,7 +3725,7 @@ _PyExc_FiniTypes(PyInterpreterState *interp)`
`3725`	`3725`	`{`
`3726`	`3726`	`for (Py_ssize_t i=Py_ARRAY_LENGTH(static_exceptions) - 1; i >= 0; i--) {`
`3727`	`3727`	`PyTypeObject *exc = static_exceptions[i].exc;`
`3728`		`- _PyStaticType_Dealloc(interp, exc);`
	`3728`	`+ _PyStaticType_FiniBuiltin(interp, exc);`
`3729`	`3729`	`}`
`3730`	`3730`	`}`
`3731`	`3731`
Original file line number	Diff line number	Diff line change
`@@ -2355,7 +2355,7 @@ _PyTypes_FiniTypes(PyInterpreterState *interp)`
`2355`	`2355`	`// their base classes.`
`2356`	`2356`	`for (Py_ssize_t i=Py_ARRAY_LENGTH(static_types)-1; i>=0; i--) {`
`2357`	`2357`	`PyTypeObject *type = static_types[i];`
`2358`		`- _PyStaticType_Dealloc(interp, type);`
	`2358`	`+ _PyStaticType_FiniBuiltin(interp, type);`
`2359`	`2359`	`}`
`2360`	`2360`	`}`
`2361`	`2361`
Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ _PyStructSequence_FiniBuiltin(PyInterpreterState interp, PyTypeObject type)`
`718`	`718`	`return;`
`719`	`719`	`}`
`720`	`720`
`721`		`- _PyStaticType_Dealloc(interp, type);`
	`721`	`+ _PyStaticType_FiniBuiltin(interp, type);`
`722`	`722`
`723`	`723`	`if (_Py_IsMainInterpreter(interp)) {`
`724`	`724`	`// Undo _PyStructSequence_InitBuiltinWithFlags().`
Original file line number	Diff line number	Diff line change
`@@ -5686,7 +5686,7 @@ clear_static_type_objects(PyInterpreterState interp, PyTypeObject type)`
`5686`	`5686`	`}`
`5687`	`5687`
`5688`	`5688`	`void`
`5689`		`-_PyStaticType_Dealloc(PyInterpreterState interp, PyTypeObject type)`
	`5689`	`+_PyStaticType_FiniBuiltin(PyInterpreterState interp, PyTypeObject type)`
`5690`	`5690`	`{`
`5691`	`5691`	`assert(type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN);`
`5692`	`5692`	`assert(_Py_IsImmortal((PyObject *)type));`
Original file line number	Diff line number	Diff line change
`@@ -15520,9 +15520,9 @@ unicode_is_finalizing(void)`
`15520`	`15520`	`void`
`15521`	`15521`	`_PyUnicode_FiniTypes(PyInterpreterState *interp)`
`15522`	`15522`	`{`
`15523`		`- _PyStaticType_Dealloc(interp, &EncodingMapType);`
`15524`		`- _PyStaticType_Dealloc(interp, &PyFieldNameIter_Type);`
`15525`		`- _PyStaticType_Dealloc(interp, &PyFormatterIter_Type);`
	`15523`	`+ _PyStaticType_FiniBuiltin(interp, &EncodingMapType);`
	`15524`	`+ _PyStaticType_FiniBuiltin(interp, &PyFieldNameIter_Type);`
	`15525`	`+ _PyStaticType_FiniBuiltin(interp, &PyFormatterIter_Type);`
`15526`	`15526`	`}`
`15527`	`15527`
`15528`	`15528`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,6 @@ static void`
`90`	`90`	`fini_exceptions(PyInterpreterState *interp)`
`91`	`91`	`{`
`92`	`92`	`// Likewise with _fini_not_shareable_error_type().`
`93`		`- _PyStaticType_Dealloc(interp, &_PyExc_InterpreterNotFoundError);`
`94`		`- _PyStaticType_Dealloc(interp, &_PyExc_InterpreterError);`
	`93`	`+ _PyStaticType_FiniBuiltin(interp, &_PyExc_InterpreterNotFoundError);`
	`94`	`+ _PyStaticType_FiniBuiltin(interp, &_PyExc_InterpreterError);`
`95`	`95`	`}`