From bcd6845e2b66adb58d36eb1d9b8fbf71900b517d Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sun, 17 Apr 2022 19:47:22 -0600
Subject: [PATCH] Replace symbol_arch with symbol::arch

This turns symbol_arch into a method on symbol.
---
 gdb/block.c            | 2 +-
 gdb/findvar.c          | 2 +-
 gdb/guile/scm-symbol.c | 2 +-
 gdb/printcmd.c         | 2 +-
 gdb/symtab.c           | 8 ++++----
 gdb/symtab.h           | 8 ++++----
 gdb/tracepoint.c       | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gdb/block.c b/gdb/block.c
index 530d2339cc6..bab6868bbbb 100644
--- 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 4f109f560b9..067fb3f6757 100644
--- 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 48ea28fb243..9e89b0458af 100644
--- 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 0e139e09c41..102058a8579 100644
--- 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 7188169f660..d5d3877d90e 100644
--- 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 f6720bb07d8..a773fccf50f 100644
--- 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 5a4048f9078..18c3803ac19 100644
--- 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);
 
-- 
2.30.2