diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/python/py-frame.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-symbol.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-frame-inline.c | 43 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-frame-inline.exp | 39 |
6 files changed, 97 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 46e69ca..e81afd7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-04-17 Jan Kratochvil <jan.kratochvil@redhat.com> + + Fix Python access to inlined frames. + * python/py-frame.c (frapy_read_var): Find BLOCK using get_frame_block. + * python/py-symbol.c (gdbpy_lookup_symbol): Likewise. + 2011-04-15 Tom Tromey <tromey@redhat.com> * dwarf2read.c (add_index_entry): Use VEC_last, not VEC_length. diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index a4ff66f..d7128a9 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -436,7 +436,7 @@ frapy_read_var (PyObject *self, PyObject *args) FRAPY_REQUIRE_VALID ((frame_object *) self, frame); if (!block) - block = block_for_pc (get_frame_address_in_block (frame)); + block = get_frame_block (frame, NULL); var = lookup_symbol (var_name, block, VAR_DOMAIN, NULL); } GDB_PY_HANDLE_EXCEPTION (except); diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 2c7900f..046d78c 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -275,8 +275,8 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw) TRY_CATCH (except, RETURN_MASK_ALL) { - selected_frame = get_selected_frame (_("No frame selected.")); - block = block_for_pc (get_frame_address_in_block (selected_frame)); + selected_frame = get_selected_frame (_("No frame selected.")); + block = get_frame_block (selected_frame, NULL); } GDB_PY_HANDLE_EXCEPTION (except); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1509919..af1fd5f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-04-17 Jan Kratochvil <jan.kratochvil@redhat.com> + + Fix Python access to inlined frames. + * gdb.python/py-frame-inline.c: New file. + * gdb.python/py-frame-inline.exp: New file. + 2011-04-13 Edjunior Machado <emachado@linux.vnet.ibm.com> * gdb.base/gdb1090.exp: Change breakpoint location to read the diff --git a/gdb/testsuite/gdb.python/py-frame-inline.c b/gdb/testsuite/gdb.python/py-frame-inline.c new file mode 100644 index 0000000..d88e666 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-frame-inline.c @@ -0,0 +1,43 @@ +/* This test is part of GDB, the GNU debugger. + + Copyright 2011 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 <http://www.gnu.org/licenses/>. */ + +volatile int v = 42; + +__attribute__((__always_inline__)) static int +f (void) +{ + /* Provide first stub line so that GDB understand the PC is already inside + the inlined function and does not expect a step into it. */ + v++; + v++; /* break-here */ + + return v; +} + +__attribute__((__noinline__)) static int +g (void) +{ + volatile int l = v; + + return f (); +} + +int +main (void) +{ + return g (); +} diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp new file mode 100644 index 0000000..f3c85d9 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-frame-inline.exp @@ -0,0 +1,39 @@ +# Copyright (C) 2011 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 <http://www.gnu.org/licenses/>. + +load_lib gdb-python.exp + +set testfile "py-frame-inline" +set srcfile ${testfile}.c +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { + return -1 +} + +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } + +if ![runto main] then { + fail "Can't run to function f" + return 0 +} + +gdb_breakpoint [gdb_get_line_number "break-here"] +gdb_continue_to_breakpoint "Block break here." + +gdb_test "info frame" "inlined into frame 1\r\n.*" + +gdb_test "up" "#1 g .*" + +gdb_test "python print gdb.selected_frame().read_var('l')" "\r\n42" |