aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/frame.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 81be400..19cb11c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21 Pedro Alves <pedro@codesourcery.com>
+
+ * frame.c (get_prev_frame_1): Build frame id before setting
+ this_frame->prev_p, not after.
+
2008-05-21 Nick Roberts <nickrob@snap.net.nz>
* annotate.c (annotate_new_thread): New function for new-thread
diff --git a/gdb/frame.c b/gdb/frame.c
index 45b9b5f..937aced 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1179,13 +1179,17 @@ get_prev_frame_1 (struct frame_info *this_frame)
}
return this_frame->prev;
}
+
+ /* If the frame id hasn't been built yet, it must be done before
+ setting a stop reason. */
+ this_id = get_frame_id (this_frame);
+
this_frame->prev_p = 1;
this_frame->stop_reason = UNWIND_NO_REASON;
/* Check that this frame's ID was valid. If it wasn't, don't try to
unwind to the prev frame. Be careful to not apply this test to
the sentinel frame. */
- this_id = get_frame_id (this_frame);
if (this_frame->level >= 0 && !frame_id_p (this_id))
{
if (frame_debug)