Skip to content

bpo-47164: Add _PyCFunctionObject_CAST() macro #32190

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.

Sign up for GitHub

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
vstinner merged 1 commit into from
Mar 31, 2022
Merged

bpo-47164: Add _PyCFunctionObject_CAST() macro #32190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
bpo-47164: Add _PyCFunctionObject_CAST() macr 
Add _PyCFunctionObject_CAST() and _PyCMethodObject_CAST() macros to
make macros casting their argument easier to read, but also to check
the type of their input in debug mode: assert(PyCFunction_Check(func)
and assert(PyCMethod_Check(func).

Reformat also PyCFunction_XXX() macros for readability.
  • Loading branch information
@vstinner
vstinner committed Mar 31, 2022
commit ad6045379e9e8b2f4e12fafc0c1817e3d7540bf5
17 changes: 11 additions & 6 deletions Include/cpython/methodobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,23 @@ 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)), (PyCFunctionObject *)(func))
#define _PyCMethodObject_CAST(func) \
(assert(PyCMethod_Check(func)), (PyCMethodObject *)(func))

/* Macros for direct access to these values. Type checks are *not*
done, so use with care. */
#define PyCFunction_GET_FUNCTION(func) \
(((PyCFunctionObject *)func) -> m_ml -> ml_meth)
(_PyCFunctionObject_CAST(func)->m_ml->ml_meth)
#define PyCFunction_GET_SELF(func) \
(((PyCFunctionObject *)func) -> m_ml -> ml_flags & METH_STATIC ? \
NULL : ((PyCFunctionObject *)func) -> m_self)
(_PyCFunctionObject_CAST(func)->m_ml->ml_flags & METH_STATIC ? \
NULL : _PyCFunctionObject_CAST(func)->m_self)
#define PyCFunction_GET_FLAGS(func) \
(((PyCFunctionObject *)func) -> m_ml -> ml_flags)
(_PyCFunctionObject_CAST(func)->m_ml->ml_flags)
#define PyCFunction_GET_CLASS(func) \
(((PyCFunctionObject *)func) -> m_ml -> ml_flags & METH_METHOD ? \
((PyCMethodObject *)func) -> mm_class : NULL)
(_PyCFunctionObject_CAST(func)->m_ml->ml_flags & METH_METHOD ? \
_PyCMethodObject_CAST(func)->mm_class : NULL)

typedef struct {
PyObject_HEAD
Expand Down