From da361ebd2db2ca7696fbb7b45e2661f80c069c72 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 5 Dec 2013 13:17:40 +0100 Subject: [PATCH] Uninitialized variable "this_id" in frame.c:get_prev_frame_1. With a simple Ada program where I have 3 functions, one just calling the next, the backtrace is currently broken when GDB is compiled at -O2: #0 hello.first () at hello.adb:5 #1 0x0000000100001475 in hello.second () at hello.adb:10 Backtrace stopped: previous frame inner to this frame (corrupt stack?) It turns out that a recent patch deleted the assignment of variable this_id, making it an unitialized variable: * frame-unwind.c (default_frame_unwind_stop_reason): Return UNWIND_OUTERMOST if the frame's ID is outer_frame_id. * frame.c (get_prev_frame_1): Remove outer_frame_id check. The hunk in question starts with: - /* Check that this frame is not the outermost. If it is, don't try - to unwind to the prev frame. */ - this_id = get_frame_id (this_frame); - if (frame_id_eq (this_id, outer_frame_id)) (the code was removed as redundant - but removing the assignment was in fact not intentional). There is no other code in this function that sets the variable. Instead of re-adding the statement in the lone section where it is actually used, I inlined it, and then got rid of the variable altogether. This way, and until we start needing this frame ID in another location within that function, we dont' have to worry about the variable's validity/lifetime. gdb/ChangeLog: * frame.c (get_prev_frame_1): Delete variable "this_id". Replace its use by a call to get_frame_id. --- gdb/ChangeLog | 5 +++++ gdb/frame.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7cae7876e31..a851326ba0d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-12-06 Joel Brobecker + + * frame.c (get_prev_frame_1): Delete variable "this_id". + Replace its use by a call to get_frame_id. + 2013-12-05 Anthony Green * moxie-tdep.c (moxie_software_single_step): New function. diff --git a/gdb/frame.c b/gdb/frame.c index db94d98b8d3..576c9697c1b 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1719,7 +1719,6 @@ get_prev_frame_if_no_cycle (struct frame_info *this_frame) static struct frame_info * get_prev_frame_1 (struct frame_info *this_frame) { - struct frame_id this_id; struct gdbarch *gdbarch; gdb_assert (this_frame != NULL); @@ -1791,7 +1790,8 @@ get_prev_frame_1 (struct frame_info *this_frame) See the comment at frame_id_inner for details. */ if (get_frame_type (this_frame) == NORMAL_FRAME && this_frame->next->unwind->type == NORMAL_FRAME - && frame_id_inner (get_frame_arch (this_frame->next), this_id, + && frame_id_inner (get_frame_arch (this_frame->next), + get_frame_id (this_frame), get_frame_id (this_frame->next))) { CORE_ADDR this_pc_in_block; -- 2.30.2