From bf1c1db5b2bc4410f670005c6c0b537ef3a4fedd Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 25 Feb 2020 11:57:12 -0500 Subject: Use bfd_get_filename instead of objfile_name in lookup_dwo_unit There should be no functional difference, as objfile_name defers to bfd_get_filename if objfile::obfd is non-NULL, which should be the case here. This allows to remove a reference to dwarf2_per_cu_data::dwarf2_per_objfile. gdb/ChangeLog: * dwarf2/read.c (lookup_dwo_unit): Use bfd_get_filename instead of objfile_name. --- gdb/dwarf2/read.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 36c6434..504a260 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -6850,7 +6850,7 @@ lookup_dwo_unit (struct dwarf2_per_cu_data *this_cu, if (!signature.has_value ()) error (_("Dwarf Error: missing dwo_id for dwo_name %s" " [in module %s]"), - dwo_name, objfile_name (this_cu->dwarf2_per_objfile->objfile)); + dwo_name, bfd_get_filename (this_cu->per_bfd->obfd)); dwo_unit = lookup_dwo_comp_unit (this_cu, dwo_name, comp_dir, *signature); } -- cgit v1.1