aboutsummaryrefslogtreecommitdiff
path: root/gdb/frame.h
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2018-05-18 17:45:16 +0100
committerAndrew Burgess <andrew.burgess@embecosm.com>2018-05-24 18:01:31 +0100
commit45f25d6c83c31a48a01ef8293bb3978f5e58e653 (patch)
tree3eddbff0a9ff77faa031e6180f985b60774583a7 /gdb/frame.h
parentd9f6d7f8b636a2b32004273143d72a77d82b40de (diff)
downloadgdb-45f25d6c83c31a48a01ef8293bb3978f5e58e653.zip
gdb-45f25d6c83c31a48a01ef8293bb3978f5e58e653.tar.gz
gdb-45f25d6c83c31a48a01ef8293bb3978f5e58e653.tar.bz2
gdb: Restore selected frame in print_frame_local_vars
PR gdb/23203 reports 'bt full' causing the currently selected frame to change, this issue is fixed in this commit. Add a new class scoped_restore_selected_frame that saves and restores the selected frame. Make use of this in print_frame_local_vars to restore the selected frame on exit. gdb/ChangeLog: PR gdb/23203 * frame.c (scoped_restore_selected_frame::scoped_restore_selected_frame): Define. (scoped_restore_selected_frame::~scoped_restore_selected_frame): Define. * frame.h (class scoped_restore_selected_frame): New class. * stack.c (print_frame_local_vars): Remove catching and rethrowing of any exception, use scoped_restore_selected_frame to restore the frame instead. gdb/testsuite/ChangeLog: PR gdb/23203 * gdb.base/bt-selected-frame.c: New file. * gdb.base/bt-selected-frame.exp: New file. * lib/gdb.exp (get_current_frame_number): New function.
Diffstat (limited to 'gdb/frame.h')
-rw-r--r--gdb/frame.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/gdb/frame.h b/gdb/frame.h
index d5800b7..a6f7fd8 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -164,6 +164,25 @@ struct frame_id
int artificial_depth;
};
+/* Save and restore the currently selected frame. */
+
+class scoped_restore_selected_frame
+{
+public:
+ /* Save the currently selected frame. */
+ scoped_restore_selected_frame ();
+
+ /* Restore the currently selected frame. */
+ ~scoped_restore_selected_frame ();
+
+ DISABLE_COPY_AND_ASSIGN (scoped_restore_selected_frame);
+
+private:
+
+ /* The ID of the previously selected frame. */
+ struct frame_id m_fid;
+};
+
/* Methods for constructing and comparing Frame IDs. */
/* For convenience. All fields are zero. This means "there is no frame". */