diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/dwarf2/index-write.c | 26 |
2 files changed, 21 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9f2387d..2bb65e7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2020-02-26 Tom Tromey <tom@tromey.com> + + * dwarf2/index-write.c (psym_index_map): Change type. + (add_address_entry_worker, write_one_signatured_type) + (recursively_count_psymbols, recursively_write_psymbols) + (class debug_names, psyms_seen_size, write_gdbindex) + (write_debug_names): Use partial_symtab, not dwarf2_psymtab. + 2020-02-26 Aaron Merey <amerey@redhat.com> * Makefile.in: Handle optional debuginfod support. diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 2cbf2eb..4b711d0 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -399,7 +399,7 @@ write_hash_table (mapped_symtab *symtab, data_buf &output, data_buf &cpool) } } -typedef std::unordered_map<dwarf2_psymtab *, unsigned int> psym_index_map; +typedef std::unordered_map<partial_symtab *, unsigned int> psym_index_map; /* Helper struct for building the address table. */ struct addrmap_index_data @@ -439,7 +439,7 @@ static int add_address_entry_worker (void *datap, CORE_ADDR start_addr, void *obj) { struct addrmap_index_data *data = (struct addrmap_index_data *) datap; - dwarf2_psymtab *pst = (dwarf2_psymtab *) obj; + partial_symtab *pst = (partial_symtab *) obj; if (data->previous_valid) add_address_entry (data->objfile, data->addr_vec, @@ -582,7 +582,7 @@ write_one_signatured_type (void **slot, void *d) struct signatured_type_index_data *info = (struct signatured_type_index_data *) d; struct signatured_type *entry = (struct signatured_type *) *slot; - dwarf2_psymtab *psymtab = entry->per_cu.v.psymtab; + partial_symtab *psymtab = entry->per_cu.v.psymtab; write_psymbols (info->symtab, info->psyms_seen, @@ -612,12 +612,12 @@ write_one_signatured_type (void **slot, void *d) if they appeared in this psymtab. */ static void -recursively_count_psymbols (dwarf2_psymtab *psymtab, +recursively_count_psymbols (partial_symtab *psymtab, size_t &psyms_seen) { for (int i = 0; i < psymtab->number_of_dependencies; ++i) if (psymtab->dependencies[i]->user != NULL) - recursively_count_psymbols ((dwarf2_psymtab *) psymtab->dependencies[i], + recursively_count_psymbols (psymtab->dependencies[i], psyms_seen); psyms_seen += psymtab->n_global_syms; @@ -629,7 +629,7 @@ recursively_count_psymbols (dwarf2_psymtab *psymtab, static void recursively_write_psymbols (struct objfile *objfile, - dwarf2_psymtab *psymtab, + partial_symtab *psymtab, struct mapped_symtab *symtab, std::unordered_set<partial_symbol *> &psyms_seen, offset_type cu_index) @@ -639,7 +639,7 @@ recursively_write_psymbols (struct objfile *objfile, for (i = 0; i < psymtab->number_of_dependencies; ++i) if (psymtab->dependencies[i]->user != NULL) recursively_write_psymbols (objfile, - (dwarf2_psymtab *) psymtab->dependencies[i], + psymtab->dependencies[i], symtab, psyms_seen, cu_index); write_psymbols (symtab, @@ -869,14 +869,14 @@ public: as if they appeared in this psymtab. */ void recursively_write_psymbols (struct objfile *objfile, - dwarf2_psymtab *psymtab, + partial_symtab *psymtab, std::unordered_set<partial_symbol *> &psyms_seen, int cu_index) { for (int i = 0; i < psymtab->number_of_dependencies; ++i) if (psymtab->dependencies[i]->user != NULL) recursively_write_psymbols - (objfile, (dwarf2_psymtab *) psymtab->dependencies[i], psyms_seen, cu_index); + (objfile, psymtab->dependencies[i], psyms_seen, cu_index); write_psymbols (psyms_seen, (objfile->partial_symtabs->global_psymbols.data () @@ -1234,7 +1234,7 @@ private: write_one_signatured_type (struct signatured_type *entry, struct signatured_type_index_data *info) { - dwarf2_psymtab *psymtab = entry->per_cu.v.psymtab; + partial_symtab *psymtab = entry->per_cu.v.psymtab; write_psymbols (info->psyms_seen, (info->objfile->partial_symtabs->global_psymbols.data () @@ -1320,7 +1320,7 @@ psyms_seen_size (struct dwarf2_per_objfile *dwarf2_per_objfile) size_t psyms_count = 0; for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units) { - dwarf2_psymtab *psymtab = per_cu->v.psymtab; + partial_symtab *psymtab = per_cu->v.psymtab; if (psymtab != NULL && psymtab->user == NULL) recursively_count_psymbols (psymtab, psyms_count); @@ -1423,7 +1423,7 @@ write_gdbindex (struct dwarf2_per_objfile *dwarf2_per_objfile, FILE *out_file, { struct dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->all_comp_units[i]; - dwarf2_psymtab *psymtab = per_cu->v.psymtab; + partial_symtab *psymtab = per_cu->v.psymtab; /* CU of a shared file from 'dwz -m' may be unused by this main file. It may be referenced from a local scope but in such case it does not @@ -1508,7 +1508,7 @@ write_debug_names (struct dwarf2_per_objfile *dwarf2_per_objfile, for (int i = 0; i < dwarf2_per_objfile->all_comp_units.size (); ++i) { const dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->all_comp_units[i]; - dwarf2_psymtab *psymtab = per_cu->v.psymtab; + partial_symtab *psymtab = per_cu->v.psymtab; /* CU of a shared file from 'dwz -m' may be unused by this main file. It may be referenced from a local scope but in such |