From b64f703b51914e4e335e61492882a8137f75e082 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 24 Mar 2021 14:41:13 -0600 Subject: [PATCH] Remove 'kind' parameter from dw2_map_matching_symbols I noticed that dw2_map_matching_symbols does not use its 'kind' parameter. This patch removes it. Tested by rebuilding. 2021-03-24 Tom Tromey * dwarf2/read.c (dw2_map_matching_symbols): Update. (dw2_expand_symtabs_matching_symbol): Remove 'kind' parameter. (check_match, dw2_expand_symtabs_matching) (dwarf2_debug_names_index::map_matching_symbols) (dwarf2_debug_names_index::expand_symtabs_matching): Update. --- gdb/ChangeLog | 8 ++++++++ gdb/dwarf2/read.c | 12 +++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bd869661f69..fd19ae04195 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2021-03-24 Tom Tromey + + * dwarf2/read.c (dw2_map_matching_symbols): Update. + (dw2_expand_symtabs_matching_symbol): Remove 'kind' parameter. + (check_match, dw2_expand_symtabs_matching) + (dwarf2_debug_names_index::map_matching_symbols) + (dwarf2_debug_names_index::expand_symtabs_matching): Update. + 2021-03-24 Keith Seitz * compile/compile-cplus-types.c diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 2bfb13d6d0e..ee6f3f7f7e1 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -3798,7 +3798,6 @@ dw2_expand_symtabs_matching_symbol (mapped_index_base &index, const lookup_name_info &lookup_name_in, gdb::function_view symbol_matcher, - enum search_domain kind, gdb::function_view match_callback, dwarf2_per_objfile *per_objfile); @@ -3834,7 +3833,7 @@ dw2_map_matching_symbols return ordered_compare (symname, match_name) == 0; }; - dw2_expand_symtabs_matching_symbol (index, name, matcher, ALL_DOMAIN, + dw2_expand_symtabs_matching_symbol (index, name, matcher, [&] (offset_type namei) { struct dw2_symtab_iterator iter; @@ -4114,7 +4113,6 @@ dw2_expand_symtabs_matching_symbol (mapped_index_base &index, const lookup_name_info &lookup_name_in, gdb::function_view symbol_matcher, - enum search_domain kind, gdb::function_view match_callback, dwarf2_per_objfile *per_objfile) { @@ -4288,7 +4286,7 @@ check_match (const char *file, int line, auto expected_end = expected_list.end (); dw2_expand_symtabs_matching_symbol (mock_index, lookup_name, - NULL, ALL_DOMAIN, + nullptr, [&] (offset_type idx) { const char *matched_name = mock_index.symbol_name_at (idx, per_objfile); @@ -4864,7 +4862,7 @@ dw2_expand_symtabs_matching dw2_expand_symtabs_matching_symbol (index, *lookup_name, symbol_matcher, - kind, [&] (offset_type idx) + [&] (offset_type idx) { dw2_expand_marked_cus (per_objfile, idx, file_matcher, expansion_notify, kind); @@ -5861,7 +5859,7 @@ dwarf2_debug_names_index::map_matching_symbols return ordered_compare (symname, match_name) == 0; }; - dw2_expand_symtabs_matching_symbol (map, name, matcher, ALL_DOMAIN, + dw2_expand_symtabs_matching_symbol (map, name, matcher, [&] (offset_type namei) { /* The name was matched, now expand corresponding CUs that were @@ -5927,7 +5925,7 @@ dwarf2_debug_names_index::expand_symtabs_matching dw2_expand_symtabs_matching_symbol (map, *lookup_name, symbol_matcher, - kind, [&] (offset_type namei) + [&] (offset_type namei) { /* The name was matched, now expand corresponding CUs that were marked. */ -- 2.30.2