summaryrefslogtreecommitdiffstats
path: root/Include/pyerrors.h
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-02-25 19:44:48 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-02-25 19:44:48 (GMT)
commitee3a1b5244e60566c5d5c8f6a1ea4b381de99f1c (patch)
treead52a17fc77530870a575107a7cea9c27de17606 /Include/pyerrors.h
parent5a3e812444609329b30be837a08c11269d917b72 (diff)
downloadcpython-ee3a1b5244e60566c5d5c8f6a1ea4b381de99f1c.zip
cpython-ee3a1b5244e60566c5d5c8f6a1ea4b381de99f1c.tar.gz
cpython-ee3a1b5244e60566c5d5c8f6a1ea4b381de99f1c.tar.bz2
Variation of patch # 1624059 to speed up checking if an object is a subclass
of some of the common builtin types. Use a bit in tp_flags for each common builtin type. Check the bit to determine if any instance is a subclass of these common types. The check avoids a function call and O(n) search of the base classes. The check is done in the various Py*_Check macros rather than calling PyType_IsSubtype(). All the bits are set in tp_flags when the type is declared in the Objects/*object.c files because PyType_Ready() is not called for all the types. Should PyType_Ready() be called for all types? If so and the change is made, the changes to the Objects/*object.c files can be reverted (remove setting the tp_flags). Objects/typeobject.c would also have to be modified to add conditions for Py*_CheckExact() in addition to each the PyType_IsSubtype check.
Diffstat (limited to 'Include/pyerrors.h')
-rw-r--r--Include/pyerrors.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 9532e32..9671692 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -95,14 +95,12 @@ PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**);
/* */
#define PyExceptionClass_Check(x) \
- (PyClass_Check((x)) \
- || (PyType_Check((x)) && PyType_IsSubtype( \
- (PyTypeObject*)(x), (PyTypeObject*)PyExc_BaseException)))
-
+ (PyClass_Check((x)) || (PyType_Check((x)) && \
+ PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS)))
#define PyExceptionInstance_Check(x) \
(PyInstance_Check((x)) || \
- (PyType_IsSubtype((x)->ob_type, (PyTypeObject*)PyExc_BaseException)))
+ PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS))
#define PyExceptionClass_Name(x) \
(PyClass_Check((x)) \