From f6e649ddafd88efbd1c02432181300595dadab33 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 27 May 2020 11:14:06 -0400 Subject: [PATCH] Remove leftover references to dwarf2_per_cu_data::dwarf2_per_objfile 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. Change-Id: I965700fa793d8457711a2d6ae448aaefd779eb96 --- gdb/ChangeLog | 7 +++++++ gdb/dwarf2/read.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 45d267bdb42..b519a042c7e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-05-27 Simon Marchi + + * 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. + 2020-05-27 Simon Marchi * dwarf2/read.h (dwarf2_get_die_type): Add dwarf2_per_objfile diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 06e843aeb82..b656a18a9bb 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -7614,7 +7614,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. */ @@ -9723,7 +9723,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 *)); @@ -20593,7 +20593,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.39.2