Remove two trivial functions from dwarf2/read.c

This removes dw2_map_matching_symbols and dw2_expand_symtabs_matching,
merging them with their sole trivial callers.

gdb/ChangeLog
2021-03-31  Tom Tromey  <tom@tromey.com>

	* dwarf2/read.c (dwarf2_gdb_index::map_matching_symbols): Merge
	with dw2_map_matching_symbols.
	(dwarf2_gdb_index::expand_symtabs_matching): Merge with
	dw2_expand_symtabs_matching.
This commit is contained in:
Tom Tromey 2021-03-31 18:28:28 -06:00
parent 24b6dd1ecf
commit af82f89db0
2 changed files with 17 additions and 35 deletions

View File

@ -1,3 +1,10 @@
2021-03-31 Tom Tromey <tom@tromey.com>
* dwarf2/read.c (dwarf2_gdb_index::map_matching_symbols): Merge
with dw2_map_matching_symbols.
(dwarf2_gdb_index::expand_symtabs_matching): Merge with
dw2_expand_symtabs_matching.
2021-03-31 Tom Tromey <tromey@adacore.com>
* dwarf2/stringify.h: Fix typo.

View File

@ -3837,8 +3837,8 @@ dw2_expand_symtabs_matching_one
gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify);
static void
dw2_map_matching_symbols
void
dwarf2_gdb_index::map_matching_symbols
(struct objfile *objfile,
const lookup_name_info &name, domain_enum domain,
int global,
@ -3895,18 +3895,6 @@ dw2_map_matching_symbols
}
}
void
dwarf2_gdb_index::map_matching_symbols
(struct objfile *objfile,
const lookup_name_info &name, domain_enum domain,
int global,
gdb::function_view<symbol_found_callback_ftype> callback,
symbol_compare_ftype *ordered_compare)
{
dw2_map_matching_symbols (objfile, name, domain, global, callback,
ordered_compare);
}
/* Starting from a search name, return the string that finds the upper
bound of all strings that start with SEARCH_NAME in a sorted name
list. Returns the empty string to indicate that the upper bound is
@ -4858,8 +4846,8 @@ dw_expand_symtabs_matching_file_matcher
}
}
static void
dw2_expand_symtabs_matching
void
dwarf2_gdb_index::expand_symtabs_matching
(struct objfile *objfile,
gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
const lookup_name_info *lookup_name,
@ -4899,19 +4887,6 @@ dw2_expand_symtabs_matching
}, per_objfile);
}
void
dwarf2_gdb_index::expand_symtabs_matching
(struct objfile *objfile,
gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
const lookup_name_info *lookup_name,
gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
enum search_domain kind)
{
dw2_expand_symtabs_matching (objfile, file_matcher, lookup_name,
symbol_matcher, expansion_notify, kind);
}
/* A helper for dw2_find_pc_sect_compunit_symtab which finds the most specific
symtab. */