Replace symbol_arch with symbol::arch

This turns symbol_arch into a method on symbol.

diff --git a/gdb/block.c b/gdb/block.c
index 530d2339cc600b443683d05cd30c3ab91a2e7bfd..bab6868bbbb4b2d3b7b50af19c9a27f9715c3d4d 100644 (file)
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -60,7 +60,7 @@ struct gdbarch *
 block_gdbarch (const struct block *block)
 {
   if (BLOCK_FUNCTION (block) != NULL)
-    return symbol_arch (BLOCK_FUNCTION (block));
+    return BLOCK_FUNCTION (block)->arch ();
 
   return block_objfile (block)->arch ();
 }

diff --git a/gdb/findvar.c b/gdb/findvar.c
index 4f109f560b93c1f2cb91d497d619bc21eca55840..067fb3f67570ead7478c02b00138d6feffb0f6dd 100644 (file)
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -753,7 +753,7 @@ language_defn::read_var_value (struct symbol *var,
        lookup_data.name = var->linkage_name ();
 
        gdbarch_iterate_over_objfiles_in_search_order
-         (symbol_arch (var),
+         (var->arch (),
           minsym_lookup_iterator_cb, &lookup_data,
           var->objfile ());
        msym = lookup_data.result.minsym;

diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index 48ea28fb243f6d2460e5ec8c597a0e35576d7461..9e89b0458af16a43fe9f1111384a62e1596cc79e 100644 (file)
--- a/gdb/guile/scm-symbol.c
+++ b/gdb/guile/scm-symbol.c
@@ -115,7 +115,7 @@ syscm_get_symbol_map (struct symbol *symbol)
     }
   else
     {
-      struct gdbarch *gdbarch = symbol_arch (symbol);
+      struct gdbarch *gdbarch = symbol->arch ();
       struct syscm_gdbarch_data *data
        = (struct syscm_gdbarch_data *) gdbarch_data (gdbarch,
                                                      syscm_gdbarch_data_key);

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 0e139e09c411461388c92ce2cb615be92954c464..102058a857931be9d9b4b5984499755d0e3e1079 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1684,7 +1684,7 @@ info_address_command (const char *exp, int from_tty)
     section = sym->obj_section (sym->objfile ());
   else
     section = NULL;
-  gdbarch = symbol_arch (sym);
+  gdbarch = sym->arch ();
 
   if (SYMBOL_COMPUTED_OPS (sym) != NULL)
     {

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 7188169f660fa9481d39303d523efd254000e0c7..d5d3877d90ea4f78d5f6b9c4b380e894d5907406 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -6602,11 +6602,11 @@ symbol::objfile () const
 /* See symtab.h.  */
 
 struct gdbarch *
-symbol_arch (const struct symbol *symbol)
+symbol::arch () const
 {
-  if (!symbol->is_objfile_owned ())
-    return symbol->owner.arch;
-  return symbol->owner.symtab->compunit ()->objfile ()->arch ();
+  if (!is_objfile_owned ())
+    return owner.arch;
+  return owner.symtab->compunit ()->objfile ()->arch ();
 }
 
 /* See symtab.h.  */

diff --git a/gdb/symtab.h b/gdb/symtab.h
index f6720bb07d80446d2a42add7eee6c3544f443a0c..a773fccf50fbe86b6344ef0cb649c23eef6d7dd3 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1382,6 +1382,10 @@ struct symbol : public general_symbol_info, public allocate_on_obstack
 
   struct objfile *objfile () const;
 
+  /* Return the ARCH of this symbol.  */
+
+  struct gdbarch *arch () const;
+
   /* Data type of value */
 
   struct type *m_type = nullptr;
@@ -1498,10 +1502,6 @@ extern int register_symbol_block_impl (enum address_class aclass,
 extern int register_symbol_register_impl (enum address_class,
                                          const struct symbol_register_ops *);
 
-/* Return the ARCH of SYMBOL.  */
-
-extern struct gdbarch *symbol_arch (const struct symbol *symbol);
-
 /* Return the SYMTAB of SYMBOL.
    It is an error to call this if symbol.is_objfile_owned is false, which
    only happens for architecture-provided types.  */

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 5a4048f9078c57001f593cb6b731dea610ee7cf2..18c3803ac195d680d4011b3dab6f01d5a70fdedd 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2506,7 +2506,7 @@ info_scope_command (const char *args_in, int from_tty)
          if (symname == NULL || *symname == '\0')
            continue;           /* Probably botched, certainly useless.  */
 
-         gdbarch = symbol_arch (sym);
+         gdbarch = sym->arch ();
 
          gdb_printf ("Symbol %s is ", symname);