* frame.c (get_prev_frame): Use result from

get_frame_address_in_block instead of get_frame_pc as argument to
inside_main_func.  Fixes PR backtrace/1435.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 58001db..067abd9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-19  Mark Kettenis  <kettenis@gnu.org>
+
+       * frame.c (get_prev_frame): Use result from
+       get_frame_address_in_block instead of get_frame_pc as argument to
+       inside_main_func.  Fixes PR backtrace/1435.
+
 2003-11-19  Andrew Cagney  <cagney@redhat.com>
 
        * stack.c (return_command): Handle "void", "legacy" and "unknown

diff --git a/gdb/frame.c b/gdb/frame.c
index a405a6b..bedbae4 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1790,9 +1790,13 @@ get_prev_frame (struct frame_info *this_frame)
      get_current_frame().  */
   gdb_assert (this_frame != NULL);
 
+  /* Make sure we pass an address within THIS_FRAME's code block to
+     inside_main_func.  Otherwise, we might stop unwinding at a
+     function which has a call instruction as its last instruction if
+     that function immediately precedes main().  */
   if (this_frame->level >= 0
       && !backtrace_past_main
-      && inside_main_func (get_frame_pc (this_frame)))
+      && inside_main_func (get_frame_address_in_block (this_frame)))
     /* Don't unwind past main(), bug always unwind the sentinel frame.
        Note, this is done _before_ the frame has been marked as
        previously unwound.  That way if the user later decides to