From 5d153bd188d03fcd90deb4d3a51e93f77e095894 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 20 May 2013 20:19:54 +0000 Subject: [PATCH] * python/py-event.h (gdbpy_initialize_event_generic): Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION. * python/py-evts.c (add_new_registry): Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION. * python/python-internal.h (CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION): New macro. --- gdb/ChangeLog | 9 +++++++++ gdb/python/py-event.h | 7 ++++--- gdb/python/py-evts.c | 2 +- gdb/python/python-internal.h | 7 +++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cb3768c..949ae19 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2013-05-20 Tom Tromey + * python/py-event.h (gdbpy_initialize_event_generic): Use + CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION. + * python/py-evts.c (add_new_registry): Use + CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION. + * python/python-internal.h + (CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION): New macro. + +2013-05-20 Tom Tromey + * python/py-arch.c (archpy_disassemble): Update. * python/py-type.c (typy_get_composite, typy_lookup_typename) (typy_lookup_type): Use GDB_PY_HANDLE_EXCEPTION. diff --git a/gdb/python/py-event.h b/gdb/python/py-event.h index 1db8bd2..4850f1a 100644 --- a/gdb/python/py-event.h +++ b/gdb/python/py-event.h @@ -115,8 +115,9 @@ extern int emit_new_objfile_event (struct objfile *objfile); extern void evpy_dealloc (PyObject *self); extern int evpy_add_attribute (PyObject *event, - char *name, PyObject *attr); -int gdbpy_initialize_event_generic (PyTypeObject *type, char *name); - + char *name, PyObject *attr) + CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION; +int gdbpy_initialize_event_generic (PyTypeObject *type, char *name) + CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION; #endif /* GDB_PY_EVENT_H */ diff --git a/gdb/python/py-evts.c b/gdb/python/py-evts.c index 4c079e2..427b6d5 100644 --- a/gdb/python/py-evts.c +++ b/gdb/python/py-evts.c @@ -37,7 +37,7 @@ static struct PyModuleDef EventModuleDef = /* Initialize python events. */ -static int +static int CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION add_new_registry (eventregistry_object **registryp, char *name) { *registryp = create_eventregistry_object (); diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 2b4244c..2e09096 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -53,6 +53,13 @@ #define CPYCHECKER_SETS_EXCEPTION #endif +#ifdef WITH_CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION_ATTRIBUTE +#define CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION \ + __attribute__ ((cpychecker_negative_result_sets_exception)) +#else +#define CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION +#endif + #include /* Python 2.4 doesn't include stdint.h soon enough to get {u,}intptr_t -- 2.7.4