[PATCH v2 31/42] Remove leftover references to dwarf2_per_cu_data::dwarf2_per_objfile

Simon Marchi
2020-05-12T21:17:41Z

This patch removes the remaining references to that field in obvious
ways (the same object is already available some other way in these
contexts).

gdb/ChangeLog:

* dwarf2/read.c (process_psymtab_comp_unit): Remove reference to
dwarf2_per_cu_data::dwarf2_per_objfile.
(compute_compunit_symtab_includes): Likewise.
(dwarf2_cu::start_symtab): Likewise.
---
gdb/dwarf2/read.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 3e5f91583cb..0059e6466e5 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -7576,7 +7576,7 @@ process_psymtab_comp_unit (dwarf2_per_cu_data *this_cu,
this_cu->lang = this_cu->cu->language;

/* Age out any secondary CUs. */
- age_cached_comp_units (this_cu->dwarf2_per_objfile);
+ age_cached_comp_units (per_objfile);
}

/* Reader function for build_type_psymtabs. */
@@ -9685,7 +9685,7 @@ compute_compunit_symtab_includes (dwarf2_per_cu_data *per_cu,
/* Now we have a transitive closure of all the included symtabs. */
len = result_symtabs.size ();
cust->includes
- = XOBNEWVEC (&per_cu->dwarf2_per_objfile->objfile->objfile_obstack,
+ = XOBNEWVEC (&per_objfile->objfile->objfile_obstack,
struct compunit_symtab *, len + 1);
memcpy (cust->includes, result_symtabs.data (),
len * sizeof (compunit_symtab *));
@@ -20554,7 +20554,7 @@ dwarf2_cu::start_symtab (const char *name, const char *comp_dir,
gdb_assert (m_builder == nullptr);

m_builder.reset (new struct buildsym_compunit
- (per_cu->dwarf2_per_objfile->objfile,
+ (this->per_objfile->objfile,
name, comp_dir, language, low_pc));

list_in_scope = get_builder ()->get_file_symbols ();
--
2.26.2