From: Tom Tromey <tom@tromey.com>
Date: Sat, 22 Mar 2025 16:39:43 +0000 (-0600)
Subject: Remove 'read' call from dwz_file::read_string
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e1ef933d114b6c144785b4478346d75499c4d3d;p=thirdparty%2Fbinutils-gdb.git

Remove 'read' call from dwz_file::read_string

dwz_file::read_string calls 'read' on the section, but this isn't
needed as the sections have all been pre-read.

This patch makes this change, and refactors dwz_file a bit to make
this more obvious -- by making it clear that only the "static
constructor" can create a dwz_file.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
Tested-By: Alexandra Petlanova Hajkova <ahajkova@redhat.com>
---

diff --git a/gdb/dwarf2/dwz.c b/gdb/dwarf2/dwz.c
index e5e18a11897..d5d5112ad4c 100644
--- a/gdb/dwarf2/dwz.c
+++ b/gdb/dwarf2/dwz.c
@@ -34,7 +34,9 @@
 const char *
 dwz_file::read_string (struct objfile *objfile, LONGEST str_offset)
 {
-  str.read (objfile);
+  /* This must be true because the sections are read in when the
+     dwz_file is created.  */
+  gdb_assert (str.readin);
 
   if (str.buffer == NULL)
     error (_("DW_FORM_GNU_strp_alt used without .debug_str "
@@ -177,7 +179,7 @@ dwz_search_other_debugdirs (std::string &filename, bfd_byte *buildid,
 /* See dwz.h.  */
 
 void
-dwarf2_read_dwz_file (dwarf2_per_objfile *per_objfile)
+dwz_file::read_dwz_file (dwarf2_per_objfile *per_objfile)
 {
   bfd_size_type buildid_len_arg;
   size_t buildid_len;
@@ -261,7 +263,7 @@ dwarf2_read_dwz_file (dwarf2_per_objfile *per_objfile)
     error (_("could not find '.gnu_debugaltlink' file for %s"),
 	   per_bfd->filename ());
 
-  auto result = std::make_unique<dwz_file> (std::move (dwz_bfd));
+  dwz_file_up result (new dwz_file (std::move (dwz_bfd)));
 
   for (asection *sec : gdb_bfd_sections (result->dwz_bfd))
     locate_dwz_sections (per_objfile->objfile, result->dwz_bfd.get (),
diff --git a/gdb/dwarf2/dwz.h b/gdb/dwarf2/dwz.h
index 9f69123e7a8..06ce45045de 100644
--- a/gdb/dwarf2/dwz.h
+++ b/gdb/dwarf2/dwz.h
@@ -31,10 +31,12 @@ struct dwarf2_per_objfile;
 
 struct dwz_file
 {
-  dwz_file (gdb_bfd_ref_ptr &&bfd)
-    : dwz_bfd (std::move (bfd))
-  {
-  }
+  /* Open the separate '.dwz' debug file, if needed.  This will set
+     the appropriate field in the per-BFD structure.  If the DWZ file
+     exists, the relevant sections are read in as well.  Throws an
+     error if the .gnu_debugaltlink section exists but the file cannot
+     be found.  */
+  static void read_dwz_file (dwarf2_per_objfile *per_objfile);
 
   const char *filename () const
   {
@@ -64,16 +66,15 @@ struct dwz_file
      return a pointer to the string.  */
 
   const char *read_string (struct objfile *objfile, LONGEST str_offset);
-};
 
-using dwz_file_up = std::unique_ptr<dwz_file>;
+private:
 
-/* Open the separate '.dwz' debug file, if needed.  This just sets the
-   appropriate field in the per-BFD structure.  If the DWZ file
-   exists, the relevant sections are read in as well.  Throws an error
-   if the .gnu_debugaltlink section exists but the file cannot be
-   found.  */
+  explicit dwz_file (gdb_bfd_ref_ptr &&bfd)
+    : dwz_bfd (std::move (bfd))
+  {
+  }
+};
 
-extern void dwarf2_read_dwz_file (dwarf2_per_objfile *per_objfile);
+using dwz_file_up = std::unique_ptr<dwz_file>;
 
 #endif /* GDB_DWARF2_DWZ_H */
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 55cf02f0931..01b3a9024d8 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -1282,7 +1282,7 @@ dwarf2_has_info (struct objfile *objfile,
 	 BFD, to avoid races.  */
       try
 	{
-	  dwarf2_read_dwz_file (per_objfile);
+	  dwz_file::read_dwz_file (per_objfile);
 	}
       catch (const gdb_exception_error &err)
 	{