bpo-40170: Remove PyHeapType_GET_MEMBERS() macro (GH-30942) · python/cpython@18ea973 (original) (raw)
`@@ -1209,7 +1209,7 @@ traverse_slots(PyTypeObject *type, PyObject *self, visitproc visit, void *arg)
`
1209
1209
`PyMemberDef *mp;
`
1210
1210
``
1211
1211
`n = Py_SIZE(type);
`
1212
``
`-
mp = PyHeapType_GET_MEMBERS((PyHeapTypeObject *)type);
`
``
1212
`+
mp = _PyHeapType_GET_MEMBERS((PyHeapTypeObject *)type);
`
1213
1213
`for (i = 0; i < n; i++, mp++) {
`
1214
1214
`if (mp->type == T_OBJECT_EX) {
`
1215
1215
`char *addr = (char *)self + mp->offset;
`
`@@ -1281,7 +1281,7 @@ clear_slots(PyTypeObject *type, PyObject *self)
`
1281
1281
`PyMemberDef *mp;
`
1282
1282
``
1283
1283
`n = Py_SIZE(type);
`
1284
``
`-
mp = PyHeapType_GET_MEMBERS((PyHeapTypeObject *)type);
`
``
1284
`+
mp = _PyHeapType_GET_MEMBERS((PyHeapTypeObject *)type);
`
1285
1285
`for (i = 0; i < n; i++, mp++) {
`
1286
1286
`if (mp->type == T_OBJECT_EX && !(mp->flags & READONLY)) {
`
1287
1287
`char *addr = (char *)self + mp->offset;
`
`@@ -2977,7 +2977,7 @@ type_new_descriptors(const type_new_ctx *ctx, PyTypeObject *type)
`
2977
2977
`PyHeapTypeObject *et = (PyHeapTypeObject *)type;
`
2978
2978
`Py_ssize_t slotoffset = ctx->base->tp_basicsize;
`
2979
2979
`if (et->ht_slots != NULL) {
`
2980
``
`-
PyMemberDef *mp = PyHeapType_GET_MEMBERS(et);
`
``
2980
`+
PyMemberDef *mp = _PyHeapType_GET_MEMBERS(et);
`
2981
2981
`Py_ssize_t nslot = PyTuple_GET_SIZE(et->ht_slots);
`
2982
2982
`for (Py_ssize_t i = 0; i < nslot; i++, mp++) {
`
2983
2983
`mp->name = PyUnicode_AsUTF8(
`
`@@ -3014,7 +3014,7 @@ type_new_descriptors(const type_new_ctx *ctx, PyTypeObject *type)
`
3014
3014
``
3015
3015
`type->tp_basicsize = slotoffset;
`
3016
3016
`type->tp_itemsize = ctx->base->tp_itemsize;
`
3017
``
`-
type->tp_members = PyHeapType_GET_MEMBERS(et);
`
``
3017
`+
type->tp_members = _PyHeapType_GET_MEMBERS(et);
`
3018
3018
`return 0;
`
3019
3019
`}
`
3020
3020
``
`@@ -3570,8 +3570,8 @@ PyType_FromModuleAndSpec(PyObject *module, PyType_Spec *spec, PyObject *bases)
`
3570
3570
`else if (slot->slot == Py_tp_members) {
`
3571
3571
`/* Move the slots to the heap type itself */
`
3572
3572
`size_t len = Py_TYPE(type)->tp_itemsize * nmembers;
`
3573
``
`-
memcpy(PyHeapType_GET_MEMBERS(res), slot->pfunc, len);
`
3574
``
`-
type->tp_members = PyHeapType_GET_MEMBERS(res);
`
``
3573
`+
memcpy(_PyHeapType_GET_MEMBERS(res), slot->pfunc, len);
`
``
3574
`+
type->tp_members = _PyHeapType_GET_MEMBERS(res);
`
3575
3575
` }
`
3576
3576
`else {
`
3577
3577
`/* Copy other slots directly */
`