[PATCH] fix assertion when returning from initial frame

[PATCH] fix assertion when returning from initial frame

[Nathan Froyd]

The following patch fixes an assertion when a user attempts to return
from the initial frame (or a frame for which GDB cannot find the
previous frame due to limited debugging information).  frame_pop always
assumed that a previous frame could be found; it now checks that it
actually finds a previous frame before proceeding.

OK?  (I do not have gdb commit privileges.)

-Nathan


2007-02-21  Nathan Froyd  <froydnj@codesourcery.com>

	* frame.c (frame_pop): Check to see whether there's a frame to
	which we can pop first.

--- frame.c	(revision 163834)
+++ frame.c	(local)
@@ -524,13 +524,22 @@ frame_save_as_regcache (struct frame_inf
 void
 frame_pop (struct frame_info *this_frame)
 {
+  struct frame_info *prev_frame;
+  struct regcache *scratch;
+  struct cleanup *cleanups;
+
+  /* Ensure that we have a frame to pop to.  */
+  prev_frame = get_prev_frame_1 (this_frame);
+
+  if (!prev_frame)
+    error (_("Cannot pop the initial frame."));
+
   /* Make a copy of all the register values unwound from this frame.
      Save them in a scratch buffer so that there isn't a race between
      trying to extract the old values from the current_regcache while
      at the same time writing new values into that same cache.  */
-  struct regcache *scratch
-    = frame_save_as_regcache (get_prev_frame_1 (this_frame));
-  struct cleanup *cleanups = make_cleanup_regcache_xfree (scratch);
+  scratch = frame_save_as_regcache (prev_frame);
+  cleanups = make_cleanup_regcache_xfree (scratch);
 
   /* FIXME: cagney/2003-03-16: It should be possible to tell the
      target's register cache that it is about to be hit with a burst

Re: [PATCH] fix assertion when returning from initial frame

[Daniel Jacobowitz]

On Wed, Feb 21, 2007 at 08:24:35AM -0800, Nathan Froyd wrote:
> The following patch fixes an assertion when a user attempts to return
> from the initial frame (or a frame for which GDB cannot find the
> previous frame due to limited debugging information).  frame_pop always
> assumed that a previous frame could be found; it now checks that it
> actually finds a previous frame before proceeding.
> 
> OK?  (I do not have gdb commit privileges.)

This is OK.  Let's get you write access; then you can check it in, and
add yourself to gdb/MAINTAINERS write after approval.

Overseers, could you please add "froydnj" to the src group on
sourceware?  Thanks in advance.

-- 
Daniel Jacobowitz
CodeSourcery

Re: [PATCH] fix assertion when returning from initial frame

[Christopher Faylor]

On Tue, Feb 27, 2007 at 12:16:10PM -0500, Daniel Jacobowitz wrote:
>On Wed, Feb 21, 2007 at 08:24:35AM -0800, Nathan Froyd wrote:
>> The following patch fixes an assertion when a user attempts to return
>> from the initial frame (or a frame for which GDB cannot find the
>> previous frame due to limited debugging information).  frame_pop always
>> assumed that a previous frame could be found; it now checks that it
>> actually finds a previous frame before proceeding.
>> 
>> OK?  (I do not have gdb commit privileges.)
>
>This is OK.  Let's get you write access; then you can check it in, and
>add yourself to gdb/MAINTAINERS write after approval.
>
>Overseers, could you please add "froydnj" to the src group on
>sourceware?  Thanks in advance.

Done.

cgf