bpo-39573: Use Py_TYPE() macro in object.c (GH-18398) · python/cpython@c65b320 (original) (raw)

`@@ -1041,13 +1041,11 @@ _PyObject_GetDictPtr(PyObject *obj)

`

1041

1041

`if (dictoffset == 0)

`

1042

1042

`return NULL;

`

1043

1043

`if (dictoffset < 0) {

`

1044

``

`-

Py_ssize_t tsize;

`

1045

``

`-

size_t size;

`

1046

``

-

1047

``

`-

tsize = ((PyVarObject *)obj)->ob_size;

`

1048

``

`-

if (tsize < 0)

`

``

1044

`+

Py_ssize_t tsize = Py_SIZE(obj);

`

``

1045

`+

if (tsize < 0) {

`

1049

1046

`tsize = -tsize;

`

1050

``

`-

size = _PyObject_VAR_SIZE(tp, tsize);

`

``

1047

`+

}

`

``

1048

`+

size_t size = _PyObject_VAR_SIZE(tp, tsize);

`

1051

1049

``

1052

1050

`dictoffset += (long)size;

`

1053

1051

`_PyObject_ASSERT(obj, dictoffset > 0);

`

`@@ -1219,13 +1217,11 @@ _PyObject_GenericGetAttrWithDict(PyObject *obj, PyObject *name,

`

1219

1217

`dictoffset = tp->tp_dictoffset;

`

1220

1218

`if (dictoffset != 0) {

`

1221

1219

`if (dictoffset < 0) {

`

1222

``

`-

Py_ssize_t tsize;

`

1223

``

`-

size_t size;

`

1224

``

-

1225

``

`-

tsize = ((PyVarObject *)obj)->ob_size;

`

1226

``

`-

if (tsize < 0)

`

``

1220

`+

Py_ssize_t tsize = Py_SIZE(obj);

`

``

1221

`+

if (tsize < 0) {

`

1227

1222

`tsize = -tsize;

`

1228

``

`-

size = _PyObject_VAR_SIZE(tp, tsize);

`

``

1223

`+

}

`

``

1224

`+

size_t size = _PyObject_VAR_SIZE(tp, tsize);

`

1229

1225

`_PyObject_ASSERT(obj, size <= PY_SSIZE_T_MAX);

`

1230

1226

``

1231

1227

`dictoffset += (Py_ssize_t)size;

`