From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri, 29 Apr 2011 07:32:41 +0000 (+0000)
Subject: gdb/
X-Git-Tag: gdb_7_3-2011-07-26-release~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51aa547de3965bc7f70c31fa4bd8ee5c593e1856;p=thirdparty%2Fbinutils-gdb.git

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 91319019e8d..bbf2034f4ad 100644
--- 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 a4ff66ff0ba..d7128a9dca5 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 2c7900fa51e..046d78c76a9 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 32615f6b6fd..590df568387 100644
--- 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.