Convert set_block_compunit_symtab to method

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

diff --git a/gdb/block.c b/gdb/block.c
index c0d6ed7da9759ff8a0de52bf533c9fecfaf976e3..3cd90dcb4ed5a57965683e0d7ee1099b6cf05ca6 100644 (file)
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -404,15 +404,15 @@ allocate_global_block (struct obstack *obstack)
   return &bl->block;
 }
 
-/* Set the compunit of the global block.  */
+/* See block.h.  */
 
 void
-set_block_compunit_symtab (struct block *block, struct compunit_symtab *cu)
+block::set_compunit_symtab (struct compunit_symtab *cu)
 {
   struct global_block *gb;
 
-  gdb_assert (block->superblock () == NULL);
-  gb = (struct global_block *) block;
+  gdb_assert (superblock () == NULL);
+  gb = (struct global_block *) this;
   gdb_assert (gb->compunit_symtab == NULL);
   gb->compunit_symtab = cu;
 }

diff --git a/gdb/block.h b/gdb/block.h
index 9ce8ef519457d882122265d22cfa28bae81db16a..ce8c9679a07f0d0e1eefed5798a2568e1358b32f 100644 (file)
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -254,6 +254,10 @@ struct block
 
   const struct block *global_block () const;
 
+  /* Set the compunit of this block, which must be a global block.  */
+
+  void set_compunit_symtab (struct compunit_symtab *);
+
   /* Addresses in the executable code that are in this block.  */
 
   CORE_ADDR m_start;
@@ -417,9 +421,6 @@ extern struct block *allocate_block (struct obstack *obstack);
 
 extern struct block *allocate_global_block (struct obstack *obstack);
 
-extern void set_block_compunit_symtab (struct block *,
-                                      struct compunit_symtab *);
-
 /* Return a property to evaluate the static link associated to BLOCK.
 
    In the context of nested functions (available in Pascal, Ada and GNU C, for

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index adc554e587a39de893a6c91d053ddb8dbb1c5c61..b76fef37400b5eaedcf72e451c38684cfb7989b3 100644 (file)
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -971,7 +971,7 @@ buildsym_compunit::end_compunit_symtab_with_blockvector
   {
     struct block *b = blockvector->global_block ();
 
-    set_block_compunit_symtab (b, cu);
+    b->set_compunit_symtab (cu);
   }
 
   cu->set_macro_table (release_macros ());

diff --git a/gdb/jit.c b/gdb/jit.c
index 48bfef0a026884ff7ea9cafcb641fc725eb80d2a..f584438c2290f4ba9d4c9905105f903ec97ee1f3 100644 (file)
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -623,7 +623,7 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
       bv->set_block (i, new_block);
 
       if (i == GLOBAL_BLOCK)
-       set_block_compunit_symtab (new_block, cust);
+       new_block->set_compunit_symtab (cust);
     }
 
   /* Fill up the superblock fields for the real blocks, using the