Convert block_gdbarch to method

This converts block_gdbarch to be a method.  This was mostly written
by script.

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 0198598982cfc99600bd4860160cd377c117f51c..a1de8c43bf2dfc8929e551dccb07fb8cd5d4ffb5 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -13822,7 +13822,7 @@ public:
        if (block == NULL)
          gdbarch = target_gdbarch ();
        else
-         gdbarch = block_gdbarch (block);
+         gdbarch = block->gdbarch ();
        sym.symbol
          = language_lookup_primitive_type_as_symbol (this, gdbarch, name);
        if (sym.symbol != NULL)

diff --git a/gdb/block.c b/gdb/block.c
index d7d5f0bf19ed8a47c85ed2e35447a087edb44a6a..b9c48e79d469f0d7026a1b83392465f958c338f7 100644 (file)
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -54,12 +54,12 @@ block::objfile () const
 /* See block.  */
 
 struct gdbarch *
-block_gdbarch (const struct block *block)
+block::gdbarch () const
 {
-  if (block->function () != nullptr)
-    return block->function ()->arch ();
+  if (function () != nullptr)
+    return function ()->arch ();
 
-  return block->objfile ()->arch ();
+  return objfile ()->arch ();
 }
 
 /* See block.h.  */

diff --git a/gdb/block.h b/gdb/block.h
index 2243c9a2a525097d8a776ff5b840690c144854b4..b9f1ba81b50068e1bdbd95d3cb7c0ba01736ed98 100644 (file)
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -208,6 +208,10 @@ struct block
 
   struct objfile *objfile () const;
 
+  /* Return the architecture of this block.  */
+
+  struct gdbarch *gdbarch () const;
+
   /* Addresses in the executable code that are in this block.  */
 
   CORE_ADDR m_start;
@@ -335,10 +339,6 @@ private:
   struct block *m_blocks[1];
 };
 
-/* Return the architecture of BLOCK, which must be non-NULL.  */
-
-extern struct gdbarch *block_gdbarch (const struct block *block);
-
 extern struct symbol *block_linkage_function (const struct block *);
 
 extern struct symbol *block_containing_function (const struct block *);

diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index b1c54c57da6906114a584bf7e2ec2e9fe5d646ae..97b7a653e3374026cef7bb050de9c791b2843bf2 100644 (file)
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -197,7 +197,7 @@ cp_lookup_bare_symbol (const struct language_defn *langdef,
       if (block == NULL)
        gdbarch = target_gdbarch ();
       else
-       gdbarch = block_gdbarch (block);
+       gdbarch = block->gdbarch ();
       sym.symbol
        = language_lookup_primitive_type_as_symbol (langdef, gdbarch, name);
       sym.block = NULL;

diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c
index 2978e5fecafc46e00e6c7c3c902a6a3a9c86147f..aaef1dfae1f7f43feffd27ad000e03b8e0054d60 100644 (file)
--- a/gdb/d-namespace.c
+++ b/gdb/d-namespace.c
@@ -94,7 +94,7 @@ d_lookup_symbol (const struct language_defn *langdef,
       if (block == NULL)
        gdbarch = target_gdbarch ();
       else
-       gdbarch = block_gdbarch (block);
+       gdbarch = block->gdbarch ();
       sym.symbol
        = language_lookup_primitive_type_as_symbol (langdef, gdbarch, name);
       sym.block = NULL;

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 408416890acaac01a7bfd799e9b7941e0ba871e2..7b7e52505efc7a317f0c9628bb6791a863e6831c 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2442,7 +2442,7 @@ language_defn::lookup_symbol_nonlocal (const char *name,
       if (block == NULL)
        gdbarch = target_gdbarch ();
       else
-       gdbarch = block_gdbarch (block);
+       gdbarch = block->gdbarch ();
       result.symbol = language_lookup_primitive_type_as_symbol (this,
                                                                gdbarch, name);
       result.block = NULL;