diff options
| author | Tom Tromey <tom@tromey.com> | 2018-09-16 08:02:22 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-09-16 23:36:54 -0600 |
| commit | 4a137fec2e1a8a6372da8fca1040ee582c62f78d (patch) | |
| tree | 6b99d8cbfba9349e6018200496fbf3d6b515e91c /gdb/python/py-threadevent.c | |
| parent | 8ff03f0bfbf0dc7d125f6ea0b844636c0aba74f6 (diff) | |
| download | binutils-4a137fec2e1a8a6372da8fca1040ee582c62f78d.zip binutils-4a137fec2e1a8a6372da8fca1040ee582c62f78d.tar.gz binutils-4a137fec2e1a8a6372da8fca1040ee582c62f78d.tar.bz2 | |
Simplify uses of thread_to_thread_object
An review by Simon of an earlier showed a few spots related to
thread_to_thread_object that could be simplified. This also detected
a latent bug, where thread_to_thread_object was inconsistent about
setting the Python exception before a NULL return.
Tested on x86-64 Fedora 28.
gdb/ChangeLog
2018-09-16 Tom Tromey <tom@tromey.com>
* python/py-threadevent.c (py_get_event_thread): Simplify.
* python/py-inferior.c (infpy_thread_from_thread_handle):
Return immediately after calling thread_to_thread_object. Use
Py_RETURN_NONE.
(thread_to_thread_object): Set the exception on a NULL return.
Diffstat (limited to 'gdb/python/py-threadevent.c')
| -rw-r--r-- | gdb/python/py-threadevent.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gdb/python/py-threadevent.c b/gdb/python/py-threadevent.c index 13af1c8..ea62540 100644 --- a/gdb/python/py-threadevent.c +++ b/gdb/python/py-threadevent.c @@ -25,24 +25,15 @@ gdbpy_ref<> py_get_event_thread (ptid_t ptid) { - gdbpy_ref<> pythread; - if (non_stop) { thread_info *thread = find_thread_ptid (ptid); if (thread != nullptr) - pythread = thread_to_thread_object (thread); - } - else - pythread = gdbpy_ref<>::new_reference (Py_None); - - if (pythread == nullptr) - { + return thread_to_thread_object (thread); PyErr_SetString (PyExc_RuntimeError, "Could not find event thread"); return NULL; } - - return pythread; + return gdbpy_ref<>::new_reference (Py_None); } gdbpy_ref<> |