2003-03-11 Andrew Cagney <cagney@redhat.com>

	* frame.c (deprecated_update_frame_pc_hack): Don't assume a next
	frame.  Problem found by Corinna Vinschen.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index da117699255f204f49dd5560edbdbfadebdcd4d6..26234b84473729ae644483657e5e79f01cc205b5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-11  Andrew Cagney  <cagney@redhat.com>
+
+       * frame.c (deprecated_update_frame_pc_hack): Don't assume a next
+       frame.  Problem found by Corinna Vinschen.
+
 2003-03-11  Pierre Muller  <muller@ics.u-strasbg.fr>
 
        * doublest.c (floatformat_from_length): Accept also

diff --git a/gdb/frame.c b/gdb/frame.c
index bbe870af0f7e5f80140abf7235ac1ee39c75c158..0bef68b2a1192eecc5c1d9da09a59040b9d2700a 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1583,12 +1583,18 @@ deprecated_update_frame_pc_hack (struct frame_info *frame, CORE_ADDR pc)
 {
   /* See comment in "frame.h".  */
   frame->pc = pc;
-  /* While we're at it, update this frame's cached PC value, found in
-     the next frame.  Oh, for the day when "struct frame_info" is
-     opaque and this hack on hack can go.  */
-  gdb_assert (frame->next != NULL);
-  frame->next->pc_unwind_cache = pc;
-  frame->next->pc_unwind_cache_p = 1;
+  /* NOTE: cagney/2003-03-11: Some architectures (e.g., Arm) are
+     maintaining a locally allocated frame object.  Since such frame's
+     are not in the frame chain, it isn't possible to assume that the
+     frame has a next.  Sigh.  */
+  if (frame->next != NULL)
+    {
+      /* While we're at it, update this frame's cached PC value, found
+        in the next frame.  Oh for the day when "struct frame_info"
+        is opaque and this hack on hack can just go away.  */
+      frame->next->pc_unwind_cache = pc;
+      frame->next->pc_unwind_cache_p = 1;
+    }
 }
 
 void