diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ffcac03902a..d648e563e2d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-11-23 Joel Brobecker + + * stack.c (print_frame_local_vars): Temporarily set the selected + frame to FRAME while printing the frame's local variables. + 2015-11-23 Joel Brobecker * amd64-windows-tdep.c (amd64_windows_frame_decode_epilogue): diff --git a/gdb/stack.c b/gdb/stack.c index b825bdf9466..163b72d9e2a 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2082,6 +2082,7 @@ print_frame_local_vars (struct frame_info *frame, int num_tabs, struct print_variable_and_value_data cb_data; const struct block *block; CORE_ADDR pc; + struct gdb_exception except = exception_none; if (!get_frame_pc_if_available (frame, &pc)) { @@ -2102,9 +2103,27 @@ print_frame_local_vars (struct frame_info *frame, int num_tabs, cb_data.stream = stream; cb_data.values_printed = 0; - iterate_over_block_local_vars (block, - do_print_variable_and_value, - &cb_data); + /* Temporarily change the selected frame to the given FRAME. + This allows routines that rely on the selected frame instead + of being given a frame as parameter to use the correct frame. */ + select_frame (frame); + + TRY + { + iterate_over_block_local_vars (block, + do_print_variable_and_value, + &cb_data); + } + CATCH (ex, RETURN_MASK_ALL) + { + except = ex; + } + END_CATCH + + /* Restore the selected frame, and then rethrow if there was a problem. */ + select_frame (frame_find_by_id (cb_data.frame_id)); + if (except.reason < 0) + throw_exception (except); /* do_print_variable_and_value invalidates FRAME. */ frame = NULL; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6518f14b98e..2c59ad8b73e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-11-23 Joel Brobecker + + * gdb.base/wrong_frame_bt_full-main.c: New file. + * gdb.base/wrong_frame_bt_full-opaque.c: New file. + * gdb.base/wrong_frame_bt_full.exp: New file. + 2015-11-23 Joel Brobecker * testsuite/gdb.ada/var_rec_arr.exp: Add "ptype a1(1)" test. diff --git a/gdb/testsuite/gdb.base/wrong_frame_bt_full-main.c b/gdb/testsuite/gdb.base/wrong_frame_bt_full-main.c new file mode 100644 index 00000000000..73ab34ceacb --- /dev/null +++ b/gdb/testsuite/gdb.base/wrong_frame_bt_full-main.c @@ -0,0 +1,34 @@ +/* Copyright (C) 2015 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +extern void opaque_routine (void); + +int dyn_arr_size = 4; + +int +main (void) +{ + int i; + int my_table_size = dyn_arr_size - 1; + int my_table [my_table_size]; + + for (i = 0; i < my_table_size; i++) + my_table[i] = i; + + opaque_routine (); + return 0; +} diff --git a/gdb/testsuite/gdb.base/wrong_frame_bt_full-opaque.c b/gdb/testsuite/gdb.base/wrong_frame_bt_full-opaque.c new file mode 100644 index 00000000000..19b87702ee8 --- /dev/null +++ b/gdb/testsuite/gdb.base/wrong_frame_bt_full-opaque.c @@ -0,0 +1,22 @@ +/* Copyright (C) 2015 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +void +opaque_routine (void) +{ + /* Do nothing. */ +} diff --git a/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp b/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp new file mode 100644 index 00000000000..863cc1b8f99 --- /dev/null +++ b/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp @@ -0,0 +1,55 @@ +# Copyright (C) 2015 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Build wrong_frame_bt_full-main using two C files: +# - wrong_frame_bt_full-opaque.c, which needs to be built without +# debugging info; +# - wrong_frame_bt_full-main.c, which needs to be built with +# debugging info. +# This is why we use gdb_compile instead of relying on he usual call +# to prepare_for_testing. + +set main_testfile wrong_frame_bt_full-main +set opaque_testfile wrong_frame_bt_full-opaque + +if {[gdb_compile "${srcdir}/${subdir}/$opaque_testfile.c" \ + $opaque_testfile.o \ + object {}] != ""} { + untested "failed to compile $opaque_testfile.c" + return -1 +} + +if {[gdb_compile \ + [list ${srcdir}/${subdir}/$main_testfile.c $opaque_testfile.o] \ + [standard_output_file ${main_testfile}] \ + executable {debug}] != ""} { + untested "failed to build $main_testfile" + return -1 +} + +clean_restart ${main_testfile} + +if ![runto opaque_routine] { + untested "could not run to opaque_routine" + return -1 +} + +# Make sure that "bt full" command is capable of displaying MY_TABLE +# correctly when frame #0 (the frame which does not have any debugging +# info) is the selected frame. + +gdb_test "bt full" \ + ".*\[\r\n\]+ *my_table = \\{0, 1, 2\\}\[\r\n\]+.*" +