Skip to content

bpo-43502: Convert PyExceptionClass_Check from macro to static inline function #24875

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

Closed
erlend-aasland wants to merge 3 commits into from
Closed

bpo-43502: Convert PyExceptionClass_Check from macro to static inline function #24875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
084dfb9
bpo-43502: Convert PyExceptionClass_Check from macro to static inline…
Mar 15, 2021
a6b67e6
Address review: Move _PyExceptionClass_Check to limited API
Mar 15, 2021
fe5b0ff
Remove NEWS entry
Mar 15, 2021
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
5 changes: 5 additions & 0 deletions Include/cpython/pyerrors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *);
PyAPI_FUNC(_PyErr_StackItem*) _PyErr_GetTopmostException(PyThreadState *tstate);
PyAPI_FUNC(void) _PyErr_GetExcInfo(PyThreadState *, PyObject **, PyObject **, PyObject **);

static inline int _PyExceptionClass_Check(PyObject *exc) {
return (PyType_Check(exc) &&
PyType_FastSubclass((PyTypeObject *)(exc), Py_TPFLAGS_BASE_EXC_SUBCLASS));
}

/* Context manipulation (PEP 3134) */

PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
Expand Down
6 changes: 1 addition & 5 deletions Include/pyerrors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ PyAPI_FUNC(void) PyException_SetCause(PyObject *, PyObject *);
PyAPI_FUNC(PyObject *) PyException_GetContext(PyObject *);
PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *);

/* */

#define PyExceptionClass_Check(x) \
(PyType_Check((x)) && \
PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS))
#define PyExceptionClass_Check(exc) _PyExceptionClass_Check(_PyObject_CAST(exc))
Comment thread
erlend-aasland marked this conversation as resolved.

#define PyExceptionInstance_Check(x) \
PyType_FastSubclass(Py_TYPE(x), Py_TPFLAGS_BASE_EXC_SUBCLASS)
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/C API/2021-03-15-15-06-16.bpo-43502.G-uhre.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Convert ``PyExceptionClass_Check`` from macro to static inline function.
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
Patch by Erlend E. Aasland.