From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 25 Feb 2025 21:26:07 +0000 (-0500)
Subject: gdb/dwarf: use dwz_file::filename in a few spots
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=643a92ff411c2df0ba82697c8b2c4ab110ddf35c;p=thirdparty%2Fbinutils-gdb.git

gdb/dwarf: use dwz_file::filename in a few spots

I found a few spots where the existing dwz_file::filename method could
be used.

Change-Id: I0522b1e3abbfac2f392f9ec777c37b242ee236d8
Approved-By: Tom Tromey <tom@tromey.com>
---

diff --git a/gdb/dwarf2/dwz.c b/gdb/dwarf2/dwz.c
index 1fda21029f1..af265505c01 100644
--- a/gdb/dwarf2/dwz.c
+++ b/gdb/dwarf2/dwz.c
@@ -39,11 +39,11 @@ dwz_file::read_string (struct objfile *objfile, LONGEST str_offset)
   if (str.buffer == NULL)
     error (_("DW_FORM_GNU_strp_alt used without .debug_str "
 	     "section [in module %s]"),
-	   bfd_get_filename (dwz_bfd.get ()));
+	   this->filename ());
   if (str_offset >= str.size)
     error (_("DW_FORM_GNU_strp_alt pointing outside of "
 	     ".debug_str section [in module %s]"),
-	   bfd_get_filename (dwz_bfd.get ()));
+	   this->filename ());
   gdb_assert (HOST_CHAR_BIT == 8);
   if (str.buffer[str_offset] == '\0')
     return NULL;
diff --git a/gdb/dwarf2/read-gdb-index.c b/gdb/dwarf2/read-gdb-index.c
index 6aba850628b..6c01c7ad64e 100644
--- a/gdb/dwarf2/read-gdb-index.c
+++ b/gdb/dwarf2/read-gdb-index.c
@@ -1520,14 +1520,14 @@ dwarf2_read_gdb_index
       if (dwz_index_content.empty ())
 	return false;
 
-      if (!read_gdb_index_from_buffer (bfd_get_filename (dwz->dwz_bfd.get ()),
+      if (!read_gdb_index_from_buffer (dwz->filename (),
 				       1, dwz_index_content, &dwz_map,
 				       &dwz_list, &dwz_list_elements,
 				       &dwz_types_ignore,
 				       &dwz_types_elements_ignore))
 	{
 	  warning (_("could not read '.gdb_index' section from %s; skipping"),
-		   bfd_get_filename (dwz->dwz_bfd.get ()));
+		   dwz->filename ());
 	  return false;
 	}
     }