Skip to content

bpo-46417: Use _PyType_CAST() in Objects directory #30764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Objects/complexobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ complex_from_string_inner(const char *s, Py_ssize_t len, void *type)
if (s-start != len)
goto parse_error;

return complex_subtype_from_doubles((PyTypeObject *)type, x, y);
return complex_subtype_from_doubles(_PyType_CAST(type), x, y);

parse_error:
PyErr_SetString(PyExc_ValueError,
Expand Down
3 changes: 1 addition & 2 deletions Objects/dictobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -3450,13 +3450,12 @@ static PyObject *
dict_vectorcall(PyObject *type, PyObject * const*args,
size_t nargsf, PyObject *kwnames)
{
assert(PyType_Check(type));
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
if (!_PyArg_CheckPositional("dict", nargs, 0, 1)) {
return NULL;
}

PyObject *self = dict_new((PyTypeObject *)type, NULL, NULL);
PyObject *self = dict_new(_PyType_CAST(type), NULL, NULL);
if (self == NULL) {
return NULL;
}
Expand Down
7 changes: 2 additions & 5 deletions Objects/enumobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ static PyObject *
enumerate_vectorcall(PyObject *type, PyObject *const *args,
size_t nargsf, PyObject *kwnames)
{
assert(PyType_Check(type));
PyTypeObject *tp = (PyTypeObject *)type;
PyTypeObject *tp = _PyType_CAST(type);
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
Py_ssize_t nkwargs = 0;
if (nargs == 0) {
Expand Down Expand Up @@ -373,8 +372,6 @@ static PyObject *
reversed_vectorcall(PyObject *type, PyObject * const*args,
size_t nargsf, PyObject *kwnames)
{
assert(PyType_Check(type));

if (!_PyArg_NoKwnames("reversed", kwnames)) {
return NULL;
}
Expand All @@ -384,7 +381,7 @@ reversed_vectorcall(PyObject *type, PyObject * const*args,
return NULL;
}

return reversed_new_impl((PyTypeObject *)type, args[0]);
return reversed_new_impl(_PyType_CAST(type), args[0]);
}

static void
Expand Down
3 changes: 1 addition & 2 deletions Objects/exceptions.c
Original file line number Diff line number Diff line change
Expand Up @@ -1775,8 +1775,7 @@ OSError_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyObject *newtype;
newtype = PyDict_GetItemWithError(state->errnomap, myerrno);
if (newtype) {
assert(PyType_Check(newtype));
type = (PyTypeObject *) newtype;
type = _PyType_CAST(newtype);
}
else if (PyErr_Occurred())
goto error;
Expand Down
2 changes: 1 addition & 1 deletion Objects/floatobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ float_vectorcall(PyObject *type, PyObject * const*args,
}

PyObject *x = nargs >= 1 ? args[0] : NULL;
return float_new_impl((PyTypeObject *)type, x);
return float_new_impl(_PyType_CAST(type), x);
}


Expand Down
3 changes: 1 addition & 2 deletions Objects/listobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -2858,8 +2858,7 @@ list_vectorcall(PyObject *type, PyObject * const*args,
return NULL;
}

assert(PyType_Check(type));
PyObject *list = PyType_GenericAlloc((PyTypeObject *)type, 0);
PyObject *list = PyType_GenericAlloc(_PyType_CAST(type), 0);
if (list == NULL) {
return NULL;
}
Expand Down
8 changes: 4 additions & 4 deletions Objects/setobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ make_new_frozenset(PyTypeObject *type, PyObject *iterable)
Py_INCREF(iterable);
return iterable;
}
return make_new_set((PyTypeObject *)type, iterable);
return make_new_set(type, iterable);
}

static PyObject *
Expand Down Expand Up @@ -1036,7 +1036,7 @@ frozenset_vectorcall(PyObject *type, PyObject * const*args,
}

PyObject *iterable = (nargs ? args[0] : NULL);
return make_new_frozenset((PyTypeObject *)type, iterable);
return make_new_frozenset(_PyType_CAST(type), iterable);
}

static PyObject *
Expand Down Expand Up @@ -1974,10 +1974,10 @@ set_vectorcall(PyObject *type, PyObject * const*args,
}

if (nargs) {
return make_new_set((PyTypeObject *)type, args[0]);
return make_new_set(_PyType_CAST(type), args[0]);
}

return make_new_set((PyTypeObject *)type, NULL);
return make_new_set(_PyType_CAST(type), NULL);
}

static PySequenceMethods set_as_sequence = {
Expand Down
3 changes: 1 addition & 2 deletions Objects/structseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,9 @@ static void
structseq_dealloc(PyStructSequence *obj)
{
Py_ssize_t i, size;
PyTypeObject *tp;
PyObject_GC_UnTrack(obj);

tp = (PyTypeObject *) Py_TYPE(obj);
PyTypeObject *tp = Py_TYPE(obj);
size = REAL_SIZE(obj);
for (i = 0; i < size; ++i) {
Py_XDECREF(obj->ob_item[i]);
Expand Down
2 changes: 1 addition & 1 deletion Objects/tupleobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ tuple_vectorcall(PyObject *type, PyObject * const*args,
}

if (nargs) {
return tuple_new_impl((PyTypeObject *)type, args[0]);
return tuple_new_impl(_PyType_CAST(type), args[0]);
}
else {
return tuple_get_empty();
Expand Down