Split struct symtab into two: struct symtab and compunit_symtab.

[deliverable/binutils-gdb.git] / gdb / frame.c

diff --git a/gdb/frame.c b/gdb/frame.c
index 5c4217c6d05a1c8ff8d9c3f1e35518bc6e0a8705..0663af9347001bc41c9c24fddb7179541054a585 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1600,13 +1600,13 @@ select_frame (struct frame_info *fi)
         block.  */
       if (get_frame_address_in_block_if_available (fi, &pc))
        {
-         struct symtab *s = find_pc_symtab (pc);
+         struct compunit_symtab *cust = find_pc_compunit_symtab (pc);
 
-         if (s
-             && s->language != current_language->la_language
-             && s->language != language_unknown
+         if (cust != NULL
+             && compunit_language (cust) != current_language->la_language
+             && compunit_language (cust) != language_unknown
              && language_mode == language_mode_auto)
-           set_language (s->language);
+           set_language (compunit_language (cust));
        }
     }
 }