diff options
| author | Tom Tromey <tom@tromey.com> | 2021-04-17 09:35:04 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2021-04-17 09:35:05 -0600 |
| commit | 3bfa51a75fc18775ea043efb248d0e2c35103202 (patch) | |
| tree | 25e27a3c0ccf85f992657dde16c25277c163f0ac /gdb/dwarf2 | |
| parent | 03a8ea51c31d8f27ec717ddb1ff68f5f5d0732ab (diff) | |
| download | gdb-3bfa51a75fc18775ea043efb248d0e2c35103202.zip gdb-3bfa51a75fc18775ea043efb248d0e2c35103202.tar.gz gdb-3bfa51a75fc18775ea043efb248d0e2c35103202.tar.bz2 | |
Add 'domain' parameter to expand_symtabs_matching
Currently, expand_symtabs_matching only accepts a search_domain
parameter. However, lookup_symbol uses a domain_enum instead, and the
two, confusingly, do quite different things -- one cannot emulate the
other. So, this patch adds a domain_enum parameter to
expand_symtabs_matching, with UNDEF_DOMAIN used as a wildcard.
This is another step toward replacing lookup_symbol with
expand_symtabs_matching.
gdb/ChangeLog
2021-04-17 Tom Tromey <tom@tromey.com>
* symtab.c (global_symbol_searcher::expand_symtabs): Update.
* symmisc.c (maintenance_expand_symtabs): Update.
* symfile.c (expand_symtabs_matching): Update.
* symfile-debug.c (objfile::expand_symtabs_matching): Add 'domain'
parameter.
* quick-symbol.h (struct quick_symbol_functions)
<expand_symtabs_matching>: Add 'domain' parameter.
* psymtab.c (recursively_search_psymtabs)
(psymbol_functions::expand_symtabs_matching): Add 'domain'
parameter.
* psympriv.h (struct psymbol_functions) <expand_symtabs_matching>:
Add 'domain' parameter.
* objfiles.h (struct objfile) <expand_symtabs_matching>: Add
'domain' parameter.
* linespec.c (iterate_over_all_matching_symtabs): Update.
* dwarf2/read.c (struct dwarf2_gdb_index)
<expand_symtabs_matching>: Add 'domain' parameter.
(struct dwarf2_debug_names_index) <expand_symtabs_matching>: Add
'domain' parameter.
(dw2_expand_symtabs_matching)
(dwarf2_gdb_index::expand_symtabs_matching)
(dw2_debug_names_iterator)
(dwarf2_debug_names_index::expand_symtabs_matching): Add 'domain'
parameter.
Diffstat (limited to 'gdb/dwarf2')
| -rw-r--r-- | gdb/dwarf2/read.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 824945a..43d276f 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -2290,6 +2290,7 @@ struct dwarf2_gdb_index : public dwarf2_base_index_functions gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher, gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify, block_search_flags search_flags, + domain_enum domain, enum search_domain kind) override; }; @@ -2320,6 +2321,7 @@ struct dwarf2_debug_names_index : public dwarf2_base_index_functions gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher, gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify, block_search_flags search_flags, + domain_enum domain, enum search_domain kind) override; }; @@ -4878,6 +4880,7 @@ dwarf2_gdb_index::expand_symtabs_matching gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher, gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify, block_search_flags search_flags, + domain_enum domain, enum search_domain kind) { dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); @@ -5398,8 +5401,10 @@ public: dw2_debug_names_iterator (const mapped_debug_names &map, search_domain search, uint32_t namei, - dwarf2_per_objfile *per_objfile) + dwarf2_per_objfile *per_objfile, + domain_enum domain = UNDEF_DOMAIN) : m_map (map), + m_domain (domain), m_search (search), m_addr (find_vec_in_debug_names (map, namei, per_objfile)), m_per_objfile (per_objfile) @@ -5950,6 +5955,7 @@ dwarf2_debug_names_index::expand_symtabs_matching gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher, gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify, block_search_flags search_flags, + domain_enum domain, enum search_domain kind) { dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); @@ -5983,7 +5989,7 @@ dwarf2_debug_names_index::expand_symtabs_matching { /* The name was matched, now expand corresponding CUs that were marked. */ - dw2_debug_names_iterator iter (map, kind, namei, per_objfile); + dw2_debug_names_iterator iter (map, kind, namei, per_objfile, domain); struct dwarf2_per_cu_data *per_cu; while ((per_cu = iter.next ()) != NULL) |