[binutils-gdb] gdb: remove COMPUNIT_BLOCK_LINE_SECTION macro, add getter/setter

[binutils-gdb] gdb: remove COMPUNIT_BLOCK_LINE_SECTION macro, add getter/setter

[Simon Marchi]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c1e35bc9c6b9d7efe0f720394b1febe71bbc728b

commit c1e35bc9c6b9d7efe0f720394b1febe71bbc728b
Author: Simon Marchi <simon.marchi@efficios.com>
Date:   Fri Nov 19 22:31:55 2021 -0500

    gdb: remove COMPUNIT_BLOCK_LINE_SECTION macro, add getter/setter
    
    Add a getter and a setter for a compunit_symtab's block line section.  Remove
    the corresponding macro and adjust all callers.
    
    Change-Id: I3eb1a323388ad55eae8bfa45f5bc4a08dc3df455

Diff:
---
 gdb/buildsym.c   |  2 +-
 gdb/dwarf2/loc.c |  2 +-
 gdb/gdbtypes.c   |  2 +-
 gdb/objfiles.c   |  4 ++--
 gdb/symtab.c     |  2 +-
 gdb/symtab.h     | 13 +++++++++++--
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 847414968af..1b162dac9e0 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -1022,7 +1022,7 @@ buildsym_compunit::end_symtab_with_blockvector (struct block *static_block,
     set_block_compunit_symtab (b, cu);
   }
 
-  COMPUNIT_BLOCK_LINE_SECTION (cu) = section;
+  cu->set_block_line_section (section);
 
   COMPUNIT_MACRO_TABLE (cu) = release_macros ();
 
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index 69b480e6e86..bf3cadba87e 100644
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -717,7 +717,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch,
       {
 	dwarf2_per_objfile *per_objfile = call_site->per_objfile;
 	compunit_symtab *cust = per_objfile->get_symtab (call_site->per_cu);
-	int sect_idx = COMPUNIT_BLOCK_LINE_SECTION (cust);
+	int sect_idx = cust->block_line_section ();
 	CORE_ADDR delta = per_objfile->objfile->section_offsets[sect_idx];
 
 	return call_site->target.loc_physaddr () + delta;
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 8af96c79e6c..79584473310 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -6285,7 +6285,7 @@ call_site::pc () const
 {
   compunit_symtab *cust = this->per_objfile->get_symtab (this->per_cu);
   CORE_ADDR delta
-	= this->per_objfile->objfile->section_offsets[COMPUNIT_BLOCK_LINE_SECTION (cust)];
+	= this->per_objfile->objfile->section_offsets[cust->block_line_section ()];
   return m_unrelocated_pc + delta;
 }
 
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index f363cb453f3..7e1ec6ca92d 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -660,7 +660,7 @@ objfile_relocate1 (struct objfile *objfile,
 	    if (l)
 	      {
 		for (int i = 0; i < l->nitems; ++i)
-		  l->item[i].pc += delta[COMPUNIT_BLOCK_LINE_SECTION (cust)];
+		  l->item[i].pc += delta[cust->block_line_section ()];
 	      }
 	  }
       }
@@ -668,7 +668,7 @@ objfile_relocate1 (struct objfile *objfile,
     for (compunit_symtab *cust : objfile->compunits ())
       {
 	const struct blockvector *bv = cust->blockvector ();
-	int block_line_section = COMPUNIT_BLOCK_LINE_SECTION (cust);
+	int block_line_section = cust->block_line_section ();
 
 	if (BLOCKVECTOR_MAP (bv))
 	  addrmap_relocate (BLOCKVECTOR_MAP (bv), delta[block_line_section]);
diff --git a/gdb/symtab.c b/gdb/symtab.c
index a0bc1dfea52..70a9f10ea4b 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -338,7 +338,7 @@ compunit_symtab::find_call_site (CORE_ADDR pc) const
     return nullptr;
 
   CORE_ADDR delta
-    = this->objfile ()->section_offsets[COMPUNIT_BLOCK_LINE_SECTION (this)];
+    = this->objfile ()->section_offsets[this->block_line_section ()];
   CORE_ADDR unrelocated_pc = pc - delta;
 
   struct call_site call_site_local (unrelocated_pc, nullptr, nullptr);
diff --git a/gdb/symtab.h b/gdb/symtab.h
index f9318ffdcb4..c59e3c3457c 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1521,6 +1521,16 @@ struct compunit_symtab
     m_blockvector = blockvector;
   }
 
+  int block_line_section () const
+  {
+    return m_block_line_section;
+  }
+
+  void set_block_line_section (int block_line_section)
+  {
+    m_block_line_section = block_line_section;
+  }
+
   /* Make PRIMARY_FILETAB the primary filetab of this compunit symtab.
 
      PRIMARY_FILETAB must already be a filetab of this compunit symtab.  */
@@ -1578,7 +1588,7 @@ struct compunit_symtab
 
   /* Section in objfile->section_offsets for the blockvector and
      the linetable.  Probably always SECT_OFF_TEXT.  */
-  int block_line_section;
+  int m_block_line_section;
 
   /* Symtab has been compiled with both optimizations and debug info so that
      GDB may stop skipping prologues as variables locations are valid already
@@ -1616,7 +1626,6 @@ struct compunit_symtab
 
 using compunit_symtab_range = next_range<compunit_symtab>;
 
-#define COMPUNIT_BLOCK_LINE_SECTION(cust) ((cust)->block_line_section)
 #define COMPUNIT_LOCATIONS_VALID(cust) ((cust)->locations_valid)
 #define COMPUNIT_EPILOGUE_UNWIND_VALID(cust) ((cust)->epilogue_unwind_valid)
 #define COMPUNIT_MACRO_TABLE(cust) ((cust)->macro_table)