bpo-46417: Clear more static types (GH-30796) · python/cpython@500c146 · GitHub
Skip to content

Commit 500c146

Browse files
vstinnervstinner
authored
bpo-46417: Clear more static types (GH-30796)
* Move PyContext static types into object.c static_types list. * Rename PyContextTokenMissing_Type to _PyContextTokenMissing_Type and declare it in pycore_context.h. * _PyHamtItems types are no long exported: replace PyAPI_DATA() with extern.
1 parent 1f8014c commit 500c146

7 files changed

Lines changed: 30 additions & 54 deletions

File tree

‎Include/internal/pycore_context.h‎

Lines changed: 3 additions & 1 deletion

‎Include/internal/pycore_hamt.h‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,16 @@
88
#define _Py_HAMT_MAX_TREE_DEPTH 7
99

1010

11+
extern PyTypeObject _PyHamt_Type;
12+
extern PyTypeObject _PyHamt_ArrayNode_Type;
13+
extern PyTypeObject _PyHamt_BitmapNode_Type;
14+
extern PyTypeObject _PyHamt_CollisionNode_Type;
15+
extern PyTypeObject _PyHamtKeys_Type;
16+
extern PyTypeObject _PyHamtValues_Type;
17+
extern PyTypeObject _PyHamtItems_Type;
18+
1119
/* runtime lifecycle */
1220

13-
PyStatus _PyHamt_InitTypes(PyInterpreterState *);
1421
void _PyHamt_Fini(PyInterpreterState *);
1522

1623

@@ -69,15 +76,6 @@ typedef struct {
6976
} PyHamtIterator;
7077

7178

72-
PyAPI_DATA(PyTypeObject) _PyHamt_Type;
73-
PyAPI_DATA(PyTypeObject) _PyHamt_ArrayNode_Type;
74-
PyAPI_DATA(PyTypeObject) _PyHamt_BitmapNode_Type;
75-
PyAPI_DATA(PyTypeObject) _PyHamt_CollisionNode_Type;
76-
PyAPI_DATA(PyTypeObject) _PyHamtKeys_Type;
77-
PyAPI_DATA(PyTypeObject) _PyHamtValues_Type;
78-
PyAPI_DATA(PyTypeObject) _PyHamtItems_Type;
79-
80-
8179
/* Create a new HAMT immutable mapping. */
8280
PyHamtObject * _PyHamt_New(void);
8381

‎Objects/object.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "Python.h"
55
#include "pycore_call.h" // _PyObject_CallNoArgs()
66
#include "pycore_ceval.h" // _Py_EnterRecursiveCall()
7+
#include "pycore_context.h" // _PyContextTokenMissing_Type
78
#include "pycore_dict.h" // _PyObject_MakeDictFromInstanceAttributes()
89
#include "pycore_floatobject.h" // _PyFloat_DebugMallocStats()
910
#include "pycore_initconfig.h" // _PyStatus_EXCEPTION()
@@ -1853,6 +1854,9 @@ static PyTypeObject* static_types[] = {
18531854
&PyClassMethod_Type,
18541855
&PyCode_Type,
18551856
&PyComplex_Type,
1857+
&PyContextToken_Type,
1858+
&PyContextVar_Type,
1859+
&PyContext_Type,
18561860
&PyCoro_Type,
18571861
&PyDictItems_Type,
18581862
&PyDictIterItem_Type,
@@ -1867,6 +1871,7 @@ static PyTypeObject* static_types[] = {
18671871
&PyDict_Type,
18681872
&PyEllipsis_Type,
18691873
&PyEnum_Type,
1874+
&PyFilter_Type,
18701875
&PyFloat_Type,
18711876
&PyFrame_Type,
18721877
&PyFrozenSet_Type,
@@ -1879,6 +1884,7 @@ static PyTypeObject* static_types[] = {
18791884
&PyList_Type,
18801885
&PyLongRangeIter_Type,
18811886
&PyLong_Type,
1887+
&PyMap_Type,
18821888
&PyMemberDescr_Type,
18831889
&PyMemoryView_Type,
18841890
&PyMethodDescr_Type,
@@ -1905,12 +1911,21 @@ static PyTypeObject* static_types[] = {
19051911
&PyUnicodeIter_Type,
19061912
&PyUnicode_Type,
19071913
&PyWrapperDescr_Type,
1914+
&PyZip_Type,
19081915
&Py_GenericAliasType,
19091916
&_PyAnextAwaitable_Type,
19101917
&_PyAsyncGenASend_Type,
19111918
&_PyAsyncGenAThrow_Type,
19121919
&_PyAsyncGenWrappedValue_Type,
1920+
&_PyContextTokenMissing_Type,
19131921
&_PyCoroWrapper_Type,
1922+
&_PyHamtItems_Type,
1923+
&_PyHamtKeys_Type,
1924+
&_PyHamtValues_Type,
1925+
&_PyHamt_ArrayNode_Type,
1926+
&_PyHamt_BitmapNode_Type,
1927+
&_PyHamt_CollisionNode_Type,
1928+
&_PyHamt_Type,
19141929
&_PyInterpreterID_Type,
19151930
&_PyManagedBuffer_Type,
19161931
&_PyMethodWrapper_Type,

‎Python/bltinmodule.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2986,11 +2986,6 @@ _PyBuiltin_Init(PyInterpreterState *interp)
29862986

29872987
const PyConfig *config = _PyInterpreterState_GetConfig(interp);
29882988

2989-
if (PyType_Ready(&PyFilter_Type) < 0 ||
2990-
PyType_Ready(&PyMap_Type) < 0 ||
2991-
PyType_Ready(&PyZip_Type) < 0)
2992-
return NULL;
2993-
29942989
mod = _PyModule_CreateInitialized(&builtinsmodule, PYTHON_API_VERSION);
29952990
if (mod == NULL)
29962991
return NULL;

‎Python/context.c‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ context_token_missing_tp_repr(PyObject *self)
12601260
}
12611261

12621262

1263-
PyTypeObject PyContextTokenMissing_Type = {
1263+
PyTypeObject _PyContextTokenMissing_Type = {
12641264
PyVarObject_HEAD_INIT(&PyType_Type, 0)
12651265
"Token.MISSING",
12661266
sizeof(PyContextTokenMissing),
@@ -1279,7 +1279,7 @@ get_token_missing(void)
12791279
}
12801280

12811281
_token_missing = (PyObject *)PyObject_New(
1282-
PyContextTokenMissing, &PyContextTokenMissing_Type);
1282+
PyContextTokenMissing, &_PyContextTokenMissing_Type);
12831283
if (_token_missing == NULL) {
12841284
return NULL;
12851285
}
@@ -1323,25 +1323,12 @@ _PyContext_Fini(PyInterpreterState *interp)
13231323

13241324

13251325
PyStatus
1326-
_PyContext_InitTypes(PyInterpreterState *interp)
1326+
_PyContext_Init(PyInterpreterState *interp)
13271327
{
13281328
if (!_Py_IsMainInterpreter(interp)) {
13291329
return _PyStatus_OK();
13301330
}
13311331

1332-
PyStatus status = _PyHamt_InitTypes(interp);
1333-
if (_PyStatus_EXCEPTION(status)) {
1334-
return status;
1335-
}
1336-
1337-
if ((PyType_Ready(&PyContext_Type) < 0) ||
1338-
(PyType_Ready(&PyContextVar_Type) < 0) ||
1339-
(PyType_Ready(&PyContextToken_Type) < 0) ||
1340-
(PyType_Ready(&PyContextTokenMissing_Type) < 0))
1341-
{
1342-
return _PyStatus_ERR("can't init context types");
1343-
}
1344-
13451332
PyObject *missing = get_token_missing();
13461333
if (PyDict_SetItemString(
13471334
PyContextToken_Type.tp_dict, "MISSING", missing))

‎Python/hamt.c‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2953,27 +2953,6 @@ PyTypeObject _PyHamt_CollisionNode_Type = {
29532953
};
29542954

29552955

2956-
PyStatus
2957-
_PyHamt_InitTypes(PyInterpreterState *interp)
2958-
{
2959-
if (!_Py_IsMainInterpreter(interp)) {
2960-
return _PyStatus_OK();
2961-
}
2962-
2963-
if ((PyType_Ready(&_PyHamt_Type) < 0) ||
2964-
(PyType_Ready(&_PyHamt_ArrayNode_Type) < 0) ||
2965-
(PyType_Ready(&_PyHamt_BitmapNode_Type) < 0) ||
2966-
(PyType_Ready(&_PyHamt_CollisionNode_Type) < 0) ||
2967-
(PyType_Ready(&_PyHamtKeys_Type) < 0) ||
2968-
(PyType_Ready(&_PyHamtValues_Type) < 0) ||
2969-
(PyType_Ready(&_PyHamtItems_Type) < 0))
2970-
{
2971-
return _PyStatus_ERR("can't init hamt types");
2972-
}
2973-
2974-
return _PyStatus_OK();
2975-
}
2976-
29772956
void
29782957
_PyHamt_Fini(PyInterpreterState *interp)
29792958
{

‎Python/pylifecycle.c‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)