Skip to content

Commit fdd8786

Browse files
ericsnowcurrentlyericsnowcurrently
authored
gh-94673: Properly Initialize and Finalize Static Builtin Types for Each Interpreter (gh-104072)
Until now, we haven't been initializing nor finalizing the per-interpreter state properly.
1 parent b1ca34d commit fdd8786

17 files changed

+145
-134
lines changed

‎Include/internal/pycore_object.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,9 @@ _PyObject_GET_WEAKREFS_LISTPTR(PyObject *op)
272272
{
273273
if (PyType_Check(op) &&
274274
((PyTypeObject *)op)->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
275+
PyInterpreterState *interp = _PyInterpreterState_GET();
275276
static_builtin_state *state = _PyStaticType_GetState(
276-
(PyTypeObject *)op);
277+
interp, (PyTypeObject *)op);
277278
return _PyStaticType_GET_WEAKREFS_LISTPTR(state);
278279
}
279280
// Essentially _PyObject_GET_WEAKREFS_LISTPTR_FROM_OFFSET():

‎Include/internal/pycore_pylifecycle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extern PyStatus _PySys_Create(
3939
extern PyStatus _PySys_ReadPreinitWarnOptions(PyWideStringList *options);
4040
extern PyStatus _PySys_ReadPreinitXOptions(PyConfig *config);
4141
extern int _PySys_UpdateConfig(PyThreadState *tstate);
42-
extern void _PySys_Fini(PyInterpreterState *interp);
42+
extern void _PySys_FiniTypes(PyInterpreterState *interp);
4343
extern int _PyBuiltins_AddExceptions(PyObject * bltinmod);
4444
extern PyStatus _Py_HashRandomization_Init(const PyConfig *);
4545

‎Include/internal/pycore_structseq.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,22 @@ PyAPI_FUNC(PyTypeObject *) _PyStructSequence_NewType(
1616
unsigned long tp_flags);
1717

1818
extern int _PyStructSequence_InitBuiltinWithFlags(
19+
PyInterpreterState *interp,
1920
PyTypeObject *type,
2021
PyStructSequence_Desc *desc,
2122
unsigned long tp_flags);
2223

2324
static inline int
24-
_PyStructSequence_InitBuiltin(PyTypeObject *type,
25+
_PyStructSequence_InitBuiltin(PyInterpreterState *interp,
26+
PyTypeObject *type,
2527
PyStructSequence_Desc *desc)
2628
{
27-
return _PyStructSequence_InitBuiltinWithFlags(type, desc, 0);
29+
return _PyStructSequence_InitBuiltinWithFlags(interp, type, desc, 0);
2830
}
2931

30-
extern void _PyStructSequence_FiniBuiltin(PyTypeObject *type);
32+
extern void _PyStructSequence_FiniBuiltin(
33+
PyInterpreterState *interp,
34+
PyTypeObject *type);
3135

3236
#ifdef __cplusplus
3337
}

‎Include/internal/pycore_typeobject.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ _PyType_GetModuleState(PyTypeObject *type)
104104
}
105105

106106

107-
extern int _PyStaticType_InitBuiltin(PyTypeObject *type);
108-
extern static_builtin_state * _PyStaticType_GetState(PyTypeObject *);
109-
extern void _PyStaticType_ClearWeakRefs(PyTypeObject *type);
110-
extern void _PyStaticType_Dealloc(PyTypeObject *type);
107+
extern int _PyStaticType_InitBuiltin(PyInterpreterState *, PyTypeObject *type);
108+
extern static_builtin_state * _PyStaticType_GetState(PyInterpreterState *, PyTypeObject *);
109+
extern void _PyStaticType_ClearWeakRefs(PyInterpreterState *, PyTypeObject *type);
110+
extern void _PyStaticType_Dealloc(PyInterpreterState *, PyTypeObject *);
111111

112112
PyObject *
113113
_Py_type_getattro_impl(PyTypeObject *type, PyObject *name, int *suppress_missing_attribute);

‎Modules/_io/_iomodule.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ _PyIO_InitTypes(PyInterpreterState *interp)
680680

681681
for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) {
682682
PyTypeObject *type = static_types[i];
683-
if (_PyStaticType_InitBuiltin(type) < 0) {
683+
if (_PyStaticType_InitBuiltin(interp, type) < 0) {
684684
return _PyStatus_ERR("Can't initialize builtin type");
685685
}
686686
}
@@ -691,15 +691,11 @@ _PyIO_InitTypes(PyInterpreterState *interp)
691691
void
692692
_PyIO_FiniTypes(PyInterpreterState *interp)
693693
{
694-
if (!_Py_IsMainInterpreter(interp)) {
695-
return;
696-
}
697-
698694
// Deallocate types in the reverse order to deallocate subclasses before
699695
// their base classes.
700696
for (Py_ssize_t i=Py_ARRAY_LENGTH(static_types) - 1; i >= 0; i--) {
701697
PyTypeObject *type = static_types[i];
702-
_PyStaticType_Dealloc(type);
698+
_PyStaticType_Dealloc(interp, type);
703699
}
704700
}
705701

‎Objects/exceptions.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,7 @@ _PyExc_InitTypes(PyInterpreterState *interp)
35983598
{
35993599
for (size_t i=0; i < Py_ARRAY_LENGTH(static_exceptions); i++) {
36003600
PyTypeObject *exc = static_exceptions[i].exc;
3601-
if (_PyStaticType_InitBuiltin(exc) < 0) {
3601+
if (_PyStaticType_InitBuiltin(interp, exc) < 0) {
36023602
return -1;
36033603
}
36043604
}
@@ -3609,13 +3609,9 @@ _PyExc_InitTypes(PyInterpreterState *interp)
36093609
static void
36103610
_PyExc_FiniTypes(PyInterpreterState *interp)
36113611
{
3612-
if (!_Py_IsMainInterpreter(interp)) {
3613-
return;
3614-
}
3615-
36163612
for (Py_ssize_t i=Py_ARRAY_LENGTH(static_exceptions) - 1; i >= 0; i--) {
36173613
PyTypeObject *exc = static_exceptions[i].exc;
3618-
_PyStaticType_Dealloc(exc);
3614+
_PyStaticType_Dealloc(interp, exc);
36193615
}
36203616
}
36213617

‎Objects/floatobject.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,8 +1991,9 @@ PyStatus
19911991
_PyFloat_InitTypes(PyInterpreterState *interp)
19921992
{
19931993
/* Init float info */
1994-
if (_PyStructSequence_InitBuiltin(&FloatInfoType,
1995-
&floatinfo_desc) < 0) {
1994+
if (_PyStructSequence_InitBuiltin(interp, &FloatInfoType,
1995+
&floatinfo_desc) < 0)
1996+
{
19961997
return _PyStatus_ERR("can't init float info type");
19971998
}
19981999

@@ -2028,9 +2029,7 @@ _PyFloat_Fini(PyInterpreterState *interp)
20282029
void
20292030
_PyFloat_FiniType(PyInterpreterState *interp)
20302031
{
2031-
if (_Py_IsMainInterpreter(interp)) {
2032-
_PyStructSequence_FiniBuiltin(&FloatInfoType);
2033-
}
2032+
_PyStructSequence_FiniBuiltin(interp, &FloatInfoType);
20342033
}
20352034

20362035
/* Print summary info about the state of the optimized allocator */

‎Objects/longobject.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "pycore_initconfig.h" // _PyStatus_OK()
88
#include "pycore_long.h" // _Py_SmallInts
99
#include "pycore_object.h" // _PyObject_Init()
10-
#include "pycore_pystate.h" // _Py_IsMainInterpreter()
1110
#include "pycore_runtime.h" // _PY_NSMALLPOSINTS
1211
#include "pycore_structseq.h" // _PyStructSequence_FiniBuiltin()
1312

@@ -6352,7 +6351,9 @@ PyStatus
63526351
_PyLong_InitTypes(PyInterpreterState *interp)
63536352
{
63546353
/* initialize int_info */
6355-
if (_PyStructSequence_InitBuiltin(&Int_InfoType, &int_info_desc) < 0) {
6354+
if (_PyStructSequence_InitBuiltin(interp, &Int_InfoType,
6355+
&int_info_desc) < 0)
6356+
{
63566357
return _PyStatus_ERR("can't init int info type");
63576358
}
63586359

@@ -6363,9 +6364,5 @@ _PyLong_InitTypes(PyInterpreterState *interp)
63636364
void
63646365
_PyLong_FiniTypes(PyInterpreterState *interp)
63656366
{
6366-
if (!_Py_IsMainInterpreter(interp)) {
6367-
return;
6368-
}
6369-
6370-
_PyStructSequence_FiniBuiltin(&Int_InfoType);
6367+
_PyStructSequence_FiniBuiltin(interp, &Int_InfoType);
63716368
}

‎Objects/object.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,7 @@ _PyTypes_InitTypes(PyInterpreterState *interp)
21052105
// All other static types (unless initialized elsewhere)
21062106
for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) {
21072107
PyTypeObject *type = static_types[i];
2108-
if (_PyStaticType_InitBuiltin(type) < 0) {
2108+
if (_PyStaticType_InitBuiltin(interp, type) < 0) {
21092109
return _PyStatus_ERR("Can't initialize builtin type");
21102110
}
21112111
if (type == &PyType_Type) {
@@ -2128,15 +2128,11 @@ _PyTypes_InitTypes(PyInterpreterState *interp)
21282128
void
21292129
_PyTypes_FiniTypes(PyInterpreterState *interp)
21302130
{
2131-
if (!_Py_IsMainInterpreter(interp)) {
2132-
return;
2133-
}
2134-
21352131
// Deallocate types in the reverse order to deallocate subclasses before
21362132
// their base classes.
21372133
for (Py_ssize_t i=Py_ARRAY_LENGTH(static_types)-1; i>=0; i--) {
21382134
PyTypeObject *type = static_types[i];
2139-
_PyStaticType_Dealloc(type);
2135+
_PyStaticType_Dealloc(interp, type);
21402136
}
21412137
}
21422138

‎Objects/structseq.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,8 @@ initialize_static_type(PyTypeObject *type, PyStructSequence_Desc *desc,
502502
}
503503

504504
int
505-
_PyStructSequence_InitBuiltinWithFlags(PyTypeObject *type,
505+
_PyStructSequence_InitBuiltinWithFlags(PyInterpreterState *interp,
506+
PyTypeObject *type,
506507
PyStructSequence_Desc *desc,
507508
unsigned long tp_flags)
508509
{
@@ -536,7 +537,7 @@ _PyStructSequence_InitBuiltinWithFlags(PyTypeObject *type,
536537
}
537538
#endif
538539

539-
if (_PyStaticType_InitBuiltin(type) < 0) {
540+
if (_PyStaticType_InitBuiltin(interp, type) < 0) {
540541
PyErr_Format(PyExc_RuntimeError,
541542
"Can't initialize builtin type %s",
542543
desc->name);
@@ -606,7 +607,7 @@ PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc)
606607
initialized via _PyStructSequence_InitBuiltinWithFlags(). */
607608

608609
void
609-
_PyStructSequence_FiniBuiltin(PyTypeObject *type)
610+
_PyStructSequence_FiniBuiltin(PyInterpreterState *interp, PyTypeObject *type)
610611
{
611612
// Ensure that the type is initialized
612613
assert(type->tp_name != NULL);
@@ -620,13 +621,15 @@ _PyStructSequence_FiniBuiltin(PyTypeObject *type)
620621
return;
621622
}
622623

623-
_PyStaticType_Dealloc(type);
624+
_PyStaticType_Dealloc(interp, type);
624625

625-
// Undo _PyStructSequence_InitBuiltinWithFlags().
626-
type->tp_name = NULL;
627-
PyMem_Free(type->tp_members);
628-
type->tp_members = NULL;
629-
type->tp_base = NULL;
626+
if (_Py_IsMainInterpreter(interp)) {
627+
// Undo _PyStructSequence_InitBuiltinWithFlags().
628+
type->tp_name = NULL;
629+
PyMem_Free(type->tp_members);
630+
type->tp_members = NULL;
631+
type->tp_base = NULL;
632+
}
630633
}
631634

632635

0 commit comments

Comments
 (0)