diff mbox series

[18/24] gdb: make so_list::sections not a pointer

Message ID	20231010204213.111285-19-simon.marchi@efficios.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 811793858C54 From: Simon Marchi <simon.marchi@efficios.com> To: gdb-patches@sourceware.org Cc: Simon Marchi <simon.marchi@efficios.com> Subject: [PATCH 18/24] gdb: make so_list::sections not a pointer Date: Tue, 10 Oct 2023 16:40:13 -0400 Message-ID: <20231010204213.111285-19-simon.marchi@efficios.com> In-Reply-To: <20231010204213.111285-1-simon.marchi@efficios.com> References: <20231010204213.111285-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org
Series	C++ification of struct so_list \| [00/24] C++ification of struct so_list [01/24] gdb: remove empty clear_solib functions [02/24] gdb: add program_space parameter to target_so_ops::clear_solib [03/24] gdb: make interps_notify work with references [04/24] gdb: replace some so_list parameters to use references [05/24] gdbsupport: use "reference" and "pointer" type aliases in intrusive_list [06/24] gdbsupport: make intrusive_list's disposer accept a reference [07/24] gdb: make get_cbfd_soname_build_id static [08/24] gdb: allocate so_list with new, deallocate with delete [09/24] gdb: rename lm_info_base to lm_info [10/24] gdb: remove target_so_ops::free_so [11/24] gdb: use gdb::checked_static_cast when casting lm_info [12/24] gdb: make solib-svr4 not use so_list internally [13/24] gdb: make solib-rocm not use so_list internally [14/24] gdb: remove lm_info_vector typedef [15/24] gdb: make so_list::lm_info a unique_ptr [16/24] gdb: make clear_so a method of struct so_list [17/24] gdb: remove target_section_table typedef [18/24] gdb: make so_list::sections not a pointer [19/24] gdb: make so_list::abfd a gdb_bfd_ref_ptr [20/24] gdb: make so_list::{so_original_name, so_name} std::strings [21/24] gdb: link so_list using intrusive_list [22/24] gdb: don't call so_list::clear in free_so [23/24] gdb: remove free_so function [24/24] gdb: rename struct so_list to so

Checks

Context	Check	Description
linaro-tcwg-bot/tcwg_gdb_build--master-arm	success	Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm	success	Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64	success	Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64	success	Testing passed

Commit Message

Simon Marchi Oct. 10, 2023, 8:40 p.m. UTC

  Make the field a vector directly, instead of a pointer to a vector.
This was needed when so_list had to be a trivial type, which is not the
case anymore.

Change-Id: I79a8378ce0d0d1e2206ca08a273ebf332cb3ba14
---
 gdb/solib.c  | 18 ++++++------------
 gdb/solist.h |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff mbox series

Patch

diff --git a/gdb/solib.c b/gdb/solib.c
index 3d6dfdc4e3c3..fabb6e1d938b 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -592,11 +592,9 @@  solib_map_sections (so_list &so)
     error (_("Shared library file name is too long."));
   strcpy (so.so_name, bfd_get_filename (so.abfd));
 
-  if (so.sections == nullptr)
-    so.sections = new std::vector<target_section>;
-  *so.sections = build_section_table (so.abfd);
+  so.sections = build_section_table (so.abfd);
 
-  for (target_section &p : *so.sections)
+  for (target_section &p : so.sections)
     {
       /* Relocate the section binding addresses as recorded in the shared
 	 object's file by the base address to which the object was actually
@@ -618,7 +616,7 @@  solib_map_sections (so_list &so)
      section tables.  Do this immediately after mapping the object so
      that later nodes in the list can query this object, as is needed
      in solib-osf.c.  */
-  current_program_space->add_target_sections (&so, *so.sections);
+  current_program_space->add_target_sections (&so, so.sections);
 
   return 1;
 }
@@ -630,8 +628,7 @@  so_list::clear ()
 {
   const target_so_ops *ops = gdbarch_so_ops (current_inferior ()->arch ());
 
-  delete this->sections;
-  this->sections = NULL;
+  this->sections.clear ();
 
   gdb_bfd_unref (this->abfd);
   this->abfd = NULL;
@@ -708,7 +705,7 @@  solib_read_symbols (so_list &so, symfile_add_flags flags)
 	  if (so.objfile == NULL)
 	    {
 	      section_addr_info sap
-		= build_section_addr_info_from_section_table (*so.sections);
+		= build_section_addr_info_from_section_table (so.sections);
 	      gdb_bfd_ref_ptr tmp_bfd
 		(gdb_bfd_ref_ptr::new_reference (so.abfd));
 	      so.objfile = symbol_file_add_from_bfd (tmp_bfd, so.so_name,
@@ -1168,10 +1165,7 @@  bool
 solib_contains_address_p (const so_list &solib,
 			  CORE_ADDR address)
 {
-  if (solib.sections == nullptr)
-    return false;
-
-  for (target_section &p : *solib.sections)
+  for (const target_section &p : solib.sections)
     if (p.addr <= address && address < p.endaddr)
       return true;
 
diff --git a/gdb/solist.h b/gdb/solist.h
index ca12fd55ba0f..51b985d53247 100644
--- a/gdb/solist.h
+++ b/gdb/solist.h
@@ -84,7 +84,7 @@  struct so_list
      the file cannot be found or after the command "nosharedlibrary".  */
   struct objfile *objfile = nullptr;
 
-  std::vector<target_section> *sections = nullptr;
+  std::vector<target_section> sections;
 
   /* Record the range of addresses belonging to this shared library.
      There may not be just one (e.g. if two segments are relocated