diff options
Diffstat (limited to 'gdb/python')
-rw-r--r-- | gdb/python/py-inferior.c | 10 | ||||
-rw-r--r-- | gdb/python/py-threadevent.c | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 68c4c9d..145f53d 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -319,6 +319,8 @@ thread_to_thread_object (thread_info *thr) if (thread->thread_obj->thread == thr) return gdbpy_ref<>::new_reference ((PyObject *) thread->thread_obj); + PyErr_SetString (PyExc_SystemError, + _("could not find gdb thread object")); return NULL; } @@ -849,7 +851,6 @@ infpy_thread_from_thread_handle (PyObject *self, PyObject *args, PyObject *kw) return NULL; } - gdbpy_ref<> result; TRY { struct thread_info *thread_info; @@ -857,7 +858,7 @@ infpy_thread_from_thread_handle (PyObject *self, PyObject *args, PyObject *kw) thread_info = find_thread_by_handle (val, inf_obj->inferior); if (thread_info != NULL) - result = thread_to_thread_object (thread_info); + return thread_to_thread_object (thread_info).release (); } CATCH (except, RETURN_MASK_ALL) { @@ -865,10 +866,7 @@ infpy_thread_from_thread_handle (PyObject *self, PyObject *args, PyObject *kw) } END_CATCH - if (result == NULL) - result = gdbpy_ref<>::new_reference (Py_None); - - return result.release (); + Py_RETURN_NONE; } /* Implement repr() for gdb.Inferior. */ 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<> |