From: Victor Stinner <vstinner@python.org>
Date: Fri, 21 Jan 2022 22:30:17 +0000 (+0100)
Subject: bpo-46417: Use _PyType_CAST() in Python directory (GH-30769)
X-Git-Tag: v3.11.0a5~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7835cbf949c413a746324721a352cc72670a8a36;p=thirdparty%2FPython%2Fcpython.git

bpo-46417: Use _PyType_CAST() in Python directory (GH-30769)
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index ef1b2bb9cf64..ecd8be1af6f2 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -536,7 +536,7 @@ static PyObject *
 filter_vectorcall(PyObject *type, PyObject * const*args,
                 size_t nargsf, PyObject *kwnames)
 {
-    PyTypeObject *tp = (PyTypeObject *)type;
+    PyTypeObject *tp = _PyType_CAST(type);
     if (tp == &PyFilter_Type && !_PyArg_NoKwnames("filter", kwnames)) {
         return NULL;
     }
@@ -1251,7 +1251,7 @@ static PyObject *
 map_vectorcall(PyObject *type, PyObject * const*args,
                 size_t nargsf, PyObject *kwnames)
 {
-    PyTypeObject *tp = (PyTypeObject *)type;
+    PyTypeObject *tp = _PyType_CAST(type);
     if (tp == &PyMap_Type && !_PyArg_NoKwnames("map", kwnames)) {
         return NULL;
     }
diff --git a/Python/specialize.c b/Python/specialize.c
index e32986ad9d61..8daeaa6cb2f5 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -1339,8 +1339,7 @@ specialize_class_call(
     PyObject *callable, _Py_CODEUNIT *instr,
     int nargs, SpecializedCacheEntry *cache)
 {
-    assert(PyType_Check(callable));
-    PyTypeObject *tp = (PyTypeObject *)callable;
+    PyTypeObject *tp = _PyType_CAST(callable);
     if (_Py_OPCODE(instr[-1]) == PRECALL_METHOD) {
         SPECIALIZATION_FAIL(CALL_NO_KW, SPEC_FAIL_METHOD_CALL_CLASS);
         return -1;