From 5ca3fcb669bc655e2e79866be086e8ac564e472b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 7 Apr 2018 13:53:39 -0400 Subject: [PATCH] Remove some unused variables in dwarf2read.c Most of them are obvious. The ones in dwarf2_record_block_ranges are less obvious, because it is a bit suspicious to have that many variables unused. But after inspection, it seems like it dates from commit 5f46c5a54825 ("Code cleanup: Split dwarf2_ranges_read to a callback"), where dwarf2_record_block_ranges was made to use dwarf2_ranges_process, which contains the same functionality. gdb/ChangeLog: * dwarf2read.c (create_signatured_type_table_from_debug_names): Remove unused variables. (dw2_map_symtabs_matching_filename): Likewise. (dwarf2_record_block_ranges): Likewise. (dwarf2_read_addr_index): Likewise. (follow_die_offset): Likewise. --- gdb/ChangeLog | 9 +++++++++ gdb/dwarf2read.c | 23 ----------------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 47d28e3747e..34da5c2fb83 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2018-04-07 Simon Marchi + + * dwarf2read.c (create_signatured_type_table_from_debug_names): + Remove unused variables. + (dw2_map_symtabs_matching_filename): Likewise. + (dwarf2_record_block_ranges): Likewise. + (dwarf2_read_addr_index): Likewise. + (follow_die_offset): Likewise. + 2018-04-07 Simon Marchi * progspace.c (clone_program_space): Pass SYMFILE_DEFER_BP_RESET diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 2eaec2d2a46..80c6b378115 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3118,9 +3118,7 @@ create_signatured_type_table_from_debug_names for (uint32_t i = 0; i < map.tu_count; ++i) { struct signatured_type *sig_type; - ULONGEST signature; void **slot; - cu_offset type_offset_in_tu; sect_offset sect_off = (sect_offset) (extract_unsigned_integer @@ -3838,7 +3836,6 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name, const char *real_path, gdb::function_view callback) { - int i; const char *name_basename = lbasename (name); struct dwarf2_per_objfile *dwarf2_per_objfile = get_dwarf2_per_objfile (objfile); @@ -14878,24 +14875,6 @@ dwarf2_record_block_ranges (struct die_info *die, struct block *block, address range list in the .debug_ranges section. */ unsigned long offset = (DW_UNSND (attr) + (need_ranges_base ? cu->ranges_base : 0)); - const gdb_byte *buffer; - - /* For some target architectures, but not others, the - read_address function sign-extends the addresses it returns. - To recognize base address selection entries, we need a - mask. */ - unsigned int addr_size = cu->header.addr_size; - CORE_ADDR base_select_mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1)); - - /* The base address, to which the next pair is relative. Note - that this 'base' is a DWARF concept: most entries in a range - list are relative, to reduce the number of relocs against the - debugging information. This is separate from this function's - 'baseaddr' argument, which GDB uses to relocate debugging - information from a shared library based on the address at - which the library was loaded. */ - CORE_ADDR base = cu->base_address; - int base_known = cu->base_known; dwarf2_ranges_process (offset, cu, [&] (CORE_ADDR start, CORE_ADDR end) @@ -19659,7 +19638,6 @@ dwarf2_read_addr_index (struct dwarf2_per_cu_data *per_cu, unsigned int addr_index) { struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile; - struct objfile *objfile = dwarf2_per_objfile->objfile; struct dwarf2_cu *cu = per_cu->cu; ULONGEST addr_base; int addr_size; @@ -22875,7 +22853,6 @@ follow_die_offset (sect_offset sect_off, int offset_in_dwz, struct dwarf2_cu *target_cu, *cu = *ref_cu; struct dwarf2_per_objfile *dwarf2_per_objfile = cu->per_cu->dwarf2_per_objfile; - struct objfile *objfile = dwarf2_per_objfile->objfile; gdb_assert (cu->per_cu != NULL); -- 2.30.2