diff options
Diffstat (limited to 'gdb/thread.c')
| -rw-r--r-- | gdb/thread.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gdb/thread.c b/gdb/thread.c index 7d8f6da353b..b48909f1e48 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1019,6 +1019,13 @@ restore_selected_frame (struct frame_id a_frame_id, int frame_level) struct frame_info *frame = NULL; int count; + /* This means there was no selected frame. */ + if (frame_level == -1) + { + select_frame (NULL); + return; + } + gdb_assert (frame_level >= 0); /* Restore by level first, check if the frame id is the same as @@ -1137,7 +1144,14 @@ make_cleanup_restore_current_thread (void) && target_has_registers && target_has_stack && target_has_memory) - frame = get_selected_frame (NULL); + { + /* When processing internal events, there might not be a + selected frame. If we naively call get_selected_frame + here, then we can end up reading debuginfo for the + current frame, but we don't generally need the debuginfo + at this point. */ + frame = get_selected_frame_if_set (); + } else frame = NULL; |