From: Andrew Cagney <cagney@redhat.com>
Date: Mon, 4 Aug 2003 15:55:07 +0000 (+0000)
Subject: 2003-08-04  Andrew Cagney  <cagney@redhat.com>
X-Git-Tag: cagney_x86i386-20030821-branchpoint~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60981e27a34b674b1c706196c67f1b8b063694e2;p=thirdparty%2Fbinutils-gdb.git

2003-08-04  Andrew Cagney  <cagney@redhat.com>

	* frame.c (frame_func_unwind): Use frame_unwind_address_in_block.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f614c86634c..b8d3d86919a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-04  Andrew Cagney  <cagney@redhat.com>
+
+	* frame.c (frame_func_unwind): Use frame_unwind_address_in_block.
+
 2003-08-03  Daniel Jacobowitz  <drow@mvista.com>
 
 	PR c++/1267
diff --git a/gdb/frame.c b/gdb/frame.c
index 58c0834cd77..86c36a38ad6 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -421,8 +421,11 @@ frame_func_unwind (struct frame_info *fi)
 {
   if (!fi->prev_func.p)
     {
+      /* Make certain that this, and not the adjacent, function is
+         found.  */
+      CORE_ADDR addr_in_block = frame_unwind_address_in_block (fi);
       fi->prev_func.p = 1;
-      fi->prev_func.addr = get_pc_function_start (frame_pc_unwind (fi));
+      fi->prev_func.addr = get_pc_function_start (addr_in_block);
       if (frame_debug)
 	fprintf_unfiltered (gdb_stdlog,
 			    "{ frame_func_unwind (fi=%d) -> 0x%s }\n",