pythongh-92135: Rename _Py_reinterpret_cast() to _Py_CAST() (python#9…

…2230) Rename also _Py_static_cast() to _Py_STATIC_CAST().
evildmp · May 3, 2022 · fbd5539 · fbd5539
1 parent f6f36cc
commit fbd5539
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h
@@ -51,7 +51,7 @@ PyAPI_FUNC(PyObject *) _PyObject_MakeTpCall(
     PyObject *keywords);
 
 #define PY_VECTORCALL_ARGUMENTS_OFFSET \
-    (_Py_static_cast(size_t, 1) << (8 * sizeof(size_t) - 1))
+    (_Py_STATIC_CAST(size_t, 1) << (8 * sizeof(size_t) - 1))
 
 static inline Py_ssize_t
 PyVectorcall_NARGS(size_t n)

diff --git a/Include/cpython/listobject.h b/Include/cpython/listobject.h
@@ -26,7 +26,7 @@ PyAPI_FUNC(void) _PyList_DebugMallocStats(FILE *out);
 
 /* Cast argument to PyListObject* type. */
 #define _PyList_CAST(op) \
-    (assert(PyList_Check(op)), _Py_reinterpret_cast(PyListObject*, (op)))
+    (assert(PyList_Check(op)), _Py_CAST(PyListObject*, (op)))
 
 // Macros and static inline functions, trading safety for speed
 

diff --git a/Include/cpython/methodobject.h b/Include/cpython/methodobject.h
@@ -9,10 +9,10 @@ PyAPI_DATA(PyTypeObject) PyCMethod_Type;
 
 #define _PyCFunctionObject_CAST(func) \
     (assert(PyCFunction_Check(func)), \
-     _Py_reinterpret_cast(PyCFunctionObject*, (func)))
+     _Py_CAST(PyCFunctionObject*, (func)))
 #define _PyCMethodObject_CAST(func) \
     (assert(PyCMethod_Check(func)), \
-     _Py_reinterpret_cast(PyCMethodObject*, (func)))
+     _Py_CAST(PyCMethodObject*, (func)))
 
 /* Macros for direct access to these values. Type checks are *not*
    done, so use with care. */

diff --git a/Include/cpython/tupleobject.h b/Include/cpython/tupleobject.h
@@ -15,7 +15,7 @@ PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
 
 /* Cast argument to PyTupleObject* type. */
 #define _PyTuple_CAST(op) \
-    (assert(PyTuple_Check(op)), _Py_reinterpret_cast(PyTupleObject*, (op)))
+    (assert(PyTuple_Check(op)), _Py_CAST(PyTupleObject*, (op)))
 
 // Macros and static inline functions, trading safety for speed
 

diff --git a/Include/cpython/unicodeobject.h b/Include/cpython/unicodeobject.h
@@ -237,13 +237,13 @@ PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
 
 #define _PyASCIIObject_CAST(op) \
     (assert(PyUnicode_Check(op)), \
-     _Py_reinterpret_cast(PyASCIIObject*, (op)))
+     _Py_CAST(PyASCIIObject*, (op)))
 #define _PyCompactUnicodeObject_CAST(op) \
     (assert(PyUnicode_Check(op)), \
-     _Py_reinterpret_cast(PyCompactUnicodeObject*, (op)))
+     _Py_CAST(PyCompactUnicodeObject*, (op)))
 #define _PyUnicodeObject_CAST(op) \
     (assert(PyUnicode_Check(op)), \
-     _Py_reinterpret_cast(PyUnicodeObject*, (op)))
+     _Py_CAST(PyUnicodeObject*, (op)))
 
 
 /* --- Flexible String Representation Helper Macros (PEP 393) -------------- */

diff --git a/Include/methodobject.h b/Include/methodobject.h
@@ -43,7 +43,7 @@ typedef PyObject *(*PyCMethod)(PyObject *, PyTypeObject *, PyObject *const *,
 // it triggers an undefined behavior when Python calls it with 2 parameters
 // (bpo-33012).
 #define _PyCFunction_CAST(func) \
-    _Py_reinterpret_cast(PyCFunction, _Py_reinterpret_cast(void(*)(void), (func)))
+    _Py_CAST(PyCFunction, _Py_CAST(void(*)(void), (func)))
 
 PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *);
 PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *);

diff --git a/Include/object.h b/Include/object.h
@@ -104,15 +104,15 @@ struct _object {
 };
 
 /* Cast argument to PyObject* type. */
-#define _PyObject_CAST(op) _Py_reinterpret_cast(PyObject*, (op))
+#define _PyObject_CAST(op) _Py_CAST(PyObject*, (op))
 
 typedef struct {
     PyObject ob_base;
     Py_ssize_t ob_size; /* Number of items in variable part */
 } PyVarObject;
 
 /* Cast argument to PyVarObject* type. */
-#define _PyVarObject_CAST(op) _Py_reinterpret_cast(PyVarObject*, (op))
+#define _PyVarObject_CAST(op) _Py_CAST(PyVarObject*, (op))
 
 
 // Test if the 'x' object is the 'y' object, the same as "x is y" in Python.
@@ -781,7 +781,7 @@ static inline int PyType_Check(PyObject *op) {
 #endif
 
 #define _PyType_CAST(op) \
-    (assert(PyType_Check(op)), _Py_reinterpret_cast(PyTypeObject*, (op)))
+    (assert(PyType_Check(op)), _Py_CAST(PyTypeObject*, (op)))
 
 static inline int PyType_CheckExact(PyObject *op) {
     return Py_IS_TYPE(op, &PyType_Type);

diff --git a/Include/objimpl.h b/Include/objimpl.h
@@ -182,9 +182,9 @@ PyAPI_FUNC(void) PyObject_GC_UnTrack(void *);
 PyAPI_FUNC(void) PyObject_GC_Del(void *);
 
 #define PyObject_GC_New(type, typeobj) \
-    _Py_reinterpret_cast(type*, _PyObject_GC_New(typeobj))
+    _Py_CAST(type*, _PyObject_GC_New(typeobj))
 #define PyObject_GC_NewVar(type, typeobj, n) \
-    _Py_reinterpret_cast(type*, _PyObject_GC_NewVar((typeobj), (n)))
+    _Py_CAST(type*, _PyObject_GC_NewVar((typeobj), (n)))
 
 PyAPI_FUNC(int) PyObject_GC_IsTracked(PyObject *);
 PyAPI_FUNC(int) PyObject_GC_IsFinalized(PyObject *);

diff --git a/Include/pyport.h b/Include/pyport.h
@@ -17,20 +17,20 @@
 // Macro to use C++ static_cast<>, reinterpret_cast<> and const_cast<>
 // in the Python C API.
 //
-// In C++, _Py_reinterpret_cast(type, expr) converts a constant expression to a
+// In C++, _Py_CAST(type, expr) converts a constant expression to a
 // non constant type using const_cast<type>. For example,
-// _Py_reinterpret_cast(PyObject*, op) can convert a "const PyObject*" to
+// _Py_CAST(PyObject*, op) can convert a "const PyObject*" to
 // "PyObject*".
 //
 // The type argument must not be constant. For example, in C++,
-// _Py_reinterpret_cast(const PyObject*, expr) fails with a compiler error.
+// _Py_CAST(const PyObject*, expr) fails with a compiler error.
 #ifdef __cplusplus
-#  define _Py_static_cast(type, expr) static_cast<type>(expr)
-#  define _Py_reinterpret_cast(type, expr) \
+#  define _Py_STATIC_CAST(type, expr) static_cast<type>(expr)
+#  define _Py_CAST(type, expr) \
        const_cast<type>(reinterpret_cast<const type>(expr))
 #else
-#  define _Py_static_cast(type, expr) ((type)(expr))
-#  define _Py_reinterpret_cast(type, expr) ((type)(expr))
+#  define _Py_STATIC_CAST(type, expr) ((type)(expr))
+#  define _Py_CAST(type, expr) ((type)(expr))
 #endif
 
 
@@ -317,10 +317,10 @@ extern "C" {
  */
 #ifdef Py_DEBUG
 #  define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) \
-       (assert(_Py_static_cast(WIDE, _Py_static_cast(NARROW, (VALUE))) == (VALUE)), \
-        _Py_static_cast(NARROW, (VALUE)))
+       (assert(_Py_STATIC_CAST(WIDE, _Py_STATIC_CAST(NARROW, (VALUE))) == (VALUE)), \
+        _Py_STATIC_CAST(NARROW, (VALUE)))
 #else
-#  define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) _Py_static_cast(NARROW, (VALUE))
+#  define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) _Py_STATIC_CAST(NARROW, (VALUE))
 #endif