From 127bbf4b50c31b75b9d4c0ecc6b014dbd7ec38f9 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 27 May 2020 11:14:06 -0400 Subject: [PATCH] Remove dwarf2_per_cu_data::dwarf2_per_objfile Nothing references this field anymore, remove it. gdb/ChangeLog: * dwarf2/read.h (struct dwarf2_per_cu_data): : Remove. * dwarf2/read.c (create_cu_from_index_list): Don't assign dwarf2_per_objfile. (create_signatured_type_table_from_index): Likewise. (create_signatured_type_table_from_debug_names): Likewise. (create_debug_type_hash_table): Likewise. (fill_in_sig_entry_from_dwo_entry): Likewise. (create_type_unit_group): Likewise. (read_comp_units_from_section): Likewise. (create_cus_hash_table): Likewise. Change-Id: Icf0b657a6beec953fe17cbe0fb2ae2c6e744d3ed --- gdb/ChangeLog | 14 ++++++++++++++ gdb/dwarf2/read.c | 8 -------- gdb/dwarf2/read.h | 3 --- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b519a042c7..64e5da9987 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2020-05-27 Simon Marchi + + * dwarf2/read.h (struct dwarf2_per_cu_data): + : Remove. + * dwarf2/read.c (create_cu_from_index_list): Don't assign + dwarf2_per_objfile. + (create_signatured_type_table_from_index): Likewise. + (create_signatured_type_table_from_debug_names): Likewise. + (create_debug_type_hash_table): Likewise. + (fill_in_sig_entry_from_dwo_entry): Likewise. + (create_type_unit_group): Likewise. + (read_comp_units_from_section): Likewise. + (create_cus_hash_table): Likewise. + 2020-05-27 Simon Marchi * dwarf2/read.c (process_psymtab_comp_unit): Remove reference to diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index b656a18a9b..88ab164d5b 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -2499,7 +2499,6 @@ create_cu_from_index_list (struct dwarf2_per_objfile *dwarf2_per_objfile, dwarf2_per_cu_data *the_cu = dwarf2_per_objfile->per_bfd->allocate_per_cu (); the_cu->sect_off = sect_off; the_cu->length = length; - the_cu->dwarf2_per_objfile = dwarf2_per_objfile; the_cu->section = section; the_cu->v.quick = OBSTACK_ZALLOC (&dwarf2_per_objfile->per_bfd->obstack, struct dwarf2_per_cu_quick_data); @@ -2591,7 +2590,6 @@ create_signatured_type_table_from_index sig_type->per_cu.is_debug_types = 1; sig_type->per_cu.section = section; sig_type->per_cu.sect_off = sect_off; - sig_type->per_cu.dwarf2_per_objfile = dwarf2_per_objfile; sig_type->per_cu.v.quick = OBSTACK_ZALLOC (&dwarf2_per_objfile->per_bfd->obstack, struct dwarf2_per_cu_quick_data); @@ -2647,7 +2645,6 @@ create_signatured_type_table_from_debug_names sig_type->per_cu.is_debug_types = 1; sig_type->per_cu.section = section; sig_type->per_cu.sect_off = sect_off; - sig_type->per_cu.dwarf2_per_objfile = dwarf2_per_objfile; sig_type->per_cu.v.quick = OBSTACK_ZALLOC (&dwarf2_per_objfile->per_bfd->obstack, struct dwarf2_per_cu_quick_data); @@ -6337,7 +6334,6 @@ create_debug_type_hash_table (struct dwarf2_per_objfile *dwarf2_per_objfile, sig_type = dwarf2_per_objfile->per_bfd->allocate_signatured_type (); sig_type->signature = header.signature; sig_type->type_offset_in_tu = header.type_cu_offset_in_tu; - sig_type->per_cu.dwarf2_per_objfile = dwarf2_per_objfile; sig_type->per_cu.is_debug_types = 1; sig_type->per_cu.section = section; sig_type->per_cu.sect_off = sect_off; @@ -6503,7 +6499,6 @@ fill_in_sig_entry_from_dwo_entry (struct dwarf2_per_objfile *dwarf2_per_objfile, sig_entry->per_cu.sect_off = dwo_entry->sect_off; sig_entry->per_cu.length = dwo_entry->length; sig_entry->per_cu.reading_dwo_directly = 1; - sig_entry->per_cu.dwarf2_per_objfile = dwarf2_per_objfile; sig_entry->per_cu.per_bfd = per_bfd; sig_entry->type_offset_in_tu = dwo_entry->type_offset_in_tu; sig_entry->dwo_unit = dwo_entry; @@ -7319,7 +7314,6 @@ create_type_unit_group (struct dwarf2_cu *cu, sect_offset line_offset_struct) tu_group = OBSTACK_ZALLOC (&dwarf2_per_objfile->per_bfd->obstack, struct type_unit_group); per_cu = &tu_group->per_cu; - per_cu->dwarf2_per_objfile = dwarf2_per_objfile; per_cu->per_bfd = per_bfd; if (per_bfd->using_index) @@ -8069,7 +8063,6 @@ read_comp_units_from_section (struct dwarf2_per_objfile *dwarf2_per_objfile, this_cu->sect_off = sect_off; this_cu->length = cu_header.length + cu_header.initial_length_size; this_cu->is_dwz = is_dwz; - this_cu->dwarf2_per_objfile = dwarf2_per_objfile; this_cu->section = section; dwarf2_per_objfile->per_bfd->all_comp_units.push_back (this_cu); @@ -11349,7 +11342,6 @@ create_cus_hash_table (struct dwarf2_per_objfile *dwarf2_per_objfile, sect_offset sect_off = (sect_offset) (info_ptr - section.buffer); memset (&per_cu, 0, sizeof (per_cu)); - per_cu.dwarf2_per_objfile = dwarf2_per_objfile; per_cu.per_bfd = per_bfd; per_cu.is_debug_types = 0; per_cu.sect_off = sect_offset (info_ptr - section.buffer); diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index cc1fd914b6..0a94036f4e 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -419,9 +419,6 @@ struct dwarf2_per_cu_data /* The language of this CU. */ enum language lang; - /* The corresponding dwarf2_per_objfile. */ - struct dwarf2_per_objfile *dwarf2_per_objfile; - /* Backlink to the owner of this. */ dwarf2_per_bfd *per_bfd;