diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/frame.c | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5b53dad..77180ef 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-16 Kevin Buettner <kevinb@redhat.com> + * frame.c (get_prev_frame): Stash frame id for current frame + prior to computing frame id for previous frame. + +2016-11-16 Kevin Buettner <kevinb@redhat.com> + * python/py-unwind.c (pending_framepy_read_register): Use value_of_register() instead of get_frame_register_value(). diff --git a/gdb/frame.c b/gdb/frame.c index 02635e6..5414cb3 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -2220,6 +2220,17 @@ get_prev_frame (struct frame_info *this_frame) something should be calling get_selected_frame() or get_current_frame(). */ gdb_assert (this_frame != NULL); + + /* If this_frame is the current frame, then compute and stash + its frame id prior to fetching and computing the frame id of the + previous frame. Otherwise, the cycle detection code in + get_prev_frame_if_no_cycle() will not work correctly. When + get_frame_id() is called later on, an assertion error will + be triggered in the event of a cycle between the current + frame and its previous frame. */ + if (this_frame->level == 0) + get_frame_id (this_frame); + frame_pc_p = get_frame_pc_if_available (this_frame, &frame_pc); /* tausq/2004-12-07: Dummy frames are skipped because it doesn't make much |