[Python-checkins] gh-89653: PEP 670: Convert PyCFunction macros to functions (#92302)

[vstinner]

https://github.com/python/cpython/commit/08b562a5dfc5cb5b94c94622763f79998aa682c3
commit: 08b562a5dfc5cb5b94c94622763f79998aa682c3
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2022-05-05T11:31:59+02:00
summary:

gh-89653: PEP 670: Convert PyCFunction macros to functions (#92302)

Convert the following macros to static inline functions:

* PyCFunction_GET_CLASS()
* PyCFunction_GET_FLAGS()
* PyCFunction_GET_FUNCTION()
* PyCFunction_GET_SELF()

Limited C API version 3.11 no longer casts arguments.

files:
M Include/cpython/methodobject.h

diff --git a/Include/cpython/methodobject.h b/Include/cpython/methodobject.h
index bbb67ec762036..54a61cfd077be 100644
--- a/Include/cpython/methodobject.h
+++ b/Include/cpython/methodobject.h
@@ -2,30 +2,7 @@
 #  error "this header file must not be included directly"
 #endif
 
-PyAPI_DATA(PyTypeObject) PyCMethod_Type;
-
-#define PyCMethod_CheckExact(op) Py_IS_TYPE(op, &PyCMethod_Type)
-#define PyCMethod_Check(op) PyObject_TypeCheck(op, &PyCMethod_Type)
-
-#define _PyCFunctionObject_CAST(func) \
-    (assert(PyCFunction_Check(func)), \
-     _Py_CAST(PyCFunctionObject*, (func)))
-#define _PyCMethodObject_CAST(func) \
-    (assert(PyCMethod_Check(func)), \
-     _Py_CAST(PyCMethodObject*, (func)))
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyCFunction_GET_FUNCTION(func) \
-    (_PyCFunctionObject_CAST(func)->m_ml->ml_meth)
-#define PyCFunction_GET_SELF(func) \
-    (_PyCFunctionObject_CAST(func)->m_ml->ml_flags & METH_STATIC ? \
-     NULL : _PyCFunctionObject_CAST(func)->m_self)
-#define PyCFunction_GET_FLAGS(func) \
-    (_PyCFunctionObject_CAST(func)->m_ml->ml_flags)
-#define PyCFunction_GET_CLASS(func) \
-    (_PyCFunctionObject_CAST(func)->m_ml->ml_flags & METH_METHOD ? \
-     _PyCMethodObject_CAST(func)->mm_class : NULL)
+// PyCFunctionObject structure
 
 typedef struct {
     PyObject_HEAD
@@ -36,7 +13,62 @@ typedef struct {
     vectorcallfunc vectorcall;
 } PyCFunctionObject;
 
+#define _PyCFunctionObject_CAST(func) \
+    (assert(PyCFunction_Check(func)), \
+     _Py_CAST(PyCFunctionObject*, (func)))
+
+
+// PyCMethodObject structure
+
 typedef struct {
     PyCFunctionObject func;
     PyTypeObject *mm_class; /* Class that defines this method */
 } PyCMethodObject;
+
+#define _PyCMethodObject_CAST(func) \
+    (assert(PyCMethod_Check(func)), \
+     _Py_CAST(PyCMethodObject*, (func)))
+
+PyAPI_DATA(PyTypeObject) PyCMethod_Type;
+
+#define PyCMethod_CheckExact(op) Py_IS_TYPE(op, &PyCMethod_Type)
+#define PyCMethod_Check(op) PyObject_TypeCheck(op, &PyCMethod_Type)
+
+
+/* Static inline functions for direct access to these values.
+   Type checks are *not* done, so use with care. */
+static inline PyCFunction PyCFunction_GET_FUNCTION(PyObject *func) {
+    return _PyCFunctionObject_CAST(func)->m_ml->ml_meth;
+}
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
+#  define PyCFunction_GET_FUNCTION(func) PyCFunction_GET_FUNCTION(_PyObject_CAST(func))
+#endif
+
+static inline PyObject* PyCFunction_GET_SELF(PyObject *func_obj) {
+    PyCFunctionObject *func = _PyCFunctionObject_CAST(func_obj);
+    if (func->m_ml->ml_flags & METH_STATIC) {
+        return _Py_NULL;
+    }
+    return func->m_self;
+}
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
+#  define PyCFunction_GET_SELF(func) PyCFunction_GET_SELF(_PyObject_CAST(func))
+#endif
+
+static inline int PyCFunction_GET_FLAGS(PyObject *func) {
+    return _PyCFunctionObject_CAST(func)->m_ml->ml_flags;
+}
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
+#  define PyCFunction_GET_FLAGS(func) PyCFunction_GET_FLAGS(_PyObject_CAST(func))
+#endif
+
+static inline PyTypeObject* PyCFunction_GET_CLASS(PyObject *func_obj) {
+    PyCFunctionObject *func = _PyCFunctionObject_CAST(func_obj);
+    if (func->m_ml->ml_flags & METH_METHOD) {
+        return _PyCMethodObject_CAST(func)->mm_class;
+    }
+    return _Py_NULL;
+}
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
+#  define PyCFunction_GET_CLASS(func) PyCFunction_GET_CLASS(_PyObject_CAST(func))
+#endif