gdb/

	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.

gdb/testsuite/
	Fix Python access to inlined frames.
	* gdb.python/py-frame-inline.c: New file.
	* gdb.python/py-frame-inline.exp: New file.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 91319019e8d28275f605cb856384d6772641e42d..bbf2034f4ada9a3221d5e6ee998d8698dd7b4f86 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-29  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-26  Michael Walle  <michael@walle.cc>
 
        * remote.c (remote_start_remote): Ack packet after sending the

diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index a4ff66ff0ba9852e6b6a3d9fb196ecc7ee233971..d7128a9dca5cb153df1b7b60ffb967d8d53930e2 100644 (file)
--- 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 2c7900fa51eff49a067e5ef413d4adea864cc731..046d78c76a94db83cde20312a6374b2905c2a628 100644 (file)
--- 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 32615f6b6fdbec4e645a899867c49f485e6bed4a..590df5683876b28b6c19e1c2f032876e42b3d200 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-29  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-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * gdb.base/gdbindex-stabs-dwarf.c: New file.