* 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.
This commit is contained in:
Mark Kettenis 2003-11-19 17:35:46 +00:00
parent 667e784fcb
commit 3f1d7f1617
2 changed files with 11 additions and 1 deletions

View file

@ -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