diff options
| author | Pedro Alves <palves@redhat.com> | 2017-05-04 14:43:34 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2017-05-04 15:17:38 +0100 |
| commit | f6223dbb50b5d8780df633633adf0742c662173d (patch) | |
| tree | f75fdf41dd3170fef252b7518c15c658f2a96717 /gdb/thread.c | |
| parent | 3c3ae77e68a9032ef9f174bf6b1cc992b6a4cb35 (diff) | |
| download | gdb-f6223dbb50b5d8780df633633adf0742c662173d.zip gdb-f6223dbb50b5d8780df633633adf0742c662173d.tar.gz gdb-f6223dbb50b5d8780df633633adf0742c662173d.tar.bz2 | |
make_cleanup_restore_current_thread: Look up thread earlier
The unconditional is_stopped call already asserts that the thread exists.
gdb/ChangeLog:
2017-05-04 Pedro Alves <palves@redhat.com>
* thread.c (make_cleanup_restore_current_thread): Move
find_thread_ptid call before the is_stopped call. Assert that the
thread is found. Replace is_stopped call by checking the thread's
state directly. Remove unnecessary NULL-thread check.
Diffstat (limited to 'gdb/thread.c')
| -rw-r--r-- | gdb/thread.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/thread.c b/gdb/thread.c index d08f414..fce37c5 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1626,9 +1626,12 @@ make_cleanup_restore_current_thread (void) if (inferior_ptid != null_ptid) { + thread_info *tp = find_thread_ptid (inferior_ptid); struct frame_info *frame; - old->was_stopped = is_stopped (inferior_ptid); + gdb_assert (tp != NULL); + + old->was_stopped = tp->state == THREAD_STOPPED; if (old->was_stopped && target_has_registers && target_has_stack @@ -1647,10 +1650,7 @@ make_cleanup_restore_current_thread (void) old->selected_frame_id = get_frame_id (frame); old->selected_frame_level = frame_relative_level (frame); - struct thread_info *tp = find_thread_ptid (inferior_ptid); - - if (tp) - tp->incref (); + tp->incref (); old->thread = tp; } |