* frame.c (select_frame): Get the current frame PC using

        get_frame_address_in_block() instead of get_frame_pc().
        * stack.c (get_frame_language): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a2c03433856d29972a34f5bbf06743c51aa5b1a..0bec02562156a370cfbd03db04e052a6204af51c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-10  J. Brobecker  <brobecker@gnat.com>
+
+       * frame.c (select_frame): Get the current frame PC using
+       get_frame_address_in_block() instead of get_frame_pc().
+       * stack.c (get_frame_language): Likewise.
+
 2003-12-08  Kevin Buettner  <kevinb@redhat.com>
 
        * remote.c (remote_open_1, remote_cisco_open): Avoid closing

diff --git a/gdb/frame.c b/gdb/frame.c
index 5dc0705a0383e485b0c15b375ded9ced4e7bbc58..1d378913fb410bdbcd9bf901b4a9aafe40584683 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -917,7 +917,13 @@ select_frame (struct frame_info *fi)
      source language of this frame, and switch to it if desired.  */
   if (fi)
     {
-      s = find_pc_symtab (get_frame_pc (fi));
+      /* We retrieve the frame's symtab by using the frame PC.  However
+         we cannot use the frame pc as is, because it usually points to
+         the instruction following the "call", which is sometimes the
+         first instruction of another function.  So we rely on
+         get_frame_address_in_block() which provides us with a PC which
+         is guaranteed to be inside the frame's code block.  */
+      s = find_pc_symtab (get_frame_address_in_block (fi));
       if (s
          && s->language != current_language->la_language
          && s->language != language_unknown

diff --git a/gdb/stack.c b/gdb/stack.c
index 04e6a18bce66df1b9db43319573660938922de73..a2b331f029e13decbf80c3abe85255ee265c1512 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -2036,7 +2036,14 @@ get_frame_language (void)
 
   if (deprecated_selected_frame)
     {
-      s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
+      /* We determine the current frame language by looking up its
+         associated symtab.  To retrieve this symtab, we use the frame PC.
+         However we cannot use the frame pc as is, because it usually points
+         to the instruction following the "call", which is sometimes the first
+         instruction of another function.  So we rely on
+         get_frame_address_in_block(), it provides us with a PC which is
+         guaranteed to be inside the frame's code block.  */
+      s = find_pc_symtab (get_frame_address_in_block (deprecated_selected_frame));
       if (s)
        flang = s->language;
       else