diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/dwarf-index-write.c | 22 |
2 files changed, 21 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 836ac9e..1141a1d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2018-04-12 Jan Kratochvil <jan.kratochvil@redhat.com> + + PR gdb/23053 + * dwarf-index-write.c (data_buf::grow) (write_one_signatured_type) + (recursively_write_psymbols) (debug_names::recursively_write_psymbols) + (debug_names::write_one_signatured_type): Fix -D_GLIBCXX_DEBUG + regression. + 2018-04-12 Tom Tromey <tom@tromey.com> * rust-lang.c (rust_print_struct_def): Remove univariant code. diff --git a/gdb/dwarf-index-write.c b/gdb/dwarf-index-write.c index 4c596c2..a5e196d 100644 --- a/gdb/dwarf-index-write.c +++ b/gdb/dwarf-index-write.c @@ -154,7 +154,7 @@ private: gdb_byte *grow (size_t size) { m_vec.resize (m_vec.size () + size); - return &*m_vec.end () - size; + return &*(m_vec.end () - size); } gdb::byte_vector m_vec; @@ -588,12 +588,14 @@ write_one_signatured_type (void **slot, void *d) write_psymbols (info->symtab, info->psyms_seen, - &info->objfile->global_psymbols[psymtab->globals_offset], + (info->objfile->global_psymbols.data () + + psymtab->globals_offset), psymtab->n_global_syms, info->cu_index, 0); write_psymbols (info->symtab, info->psyms_seen, - &info->objfile->static_psymbols[psymtab->statics_offset], + (info->objfile->static_psymbols.data () + + psymtab->statics_offset), psymtab->n_static_syms, info->cu_index, 1); @@ -643,12 +645,12 @@ recursively_write_psymbols (struct objfile *objfile, write_psymbols (symtab, psyms_seen, - &objfile->global_psymbols[psymtab->globals_offset], + objfile->global_psymbols.data () + psymtab->globals_offset, psymtab->n_global_syms, cu_index, 0); write_psymbols (symtab, psyms_seen, - &objfile->static_psymbols[psymtab->statics_offset], + objfile->static_psymbols.data () + psymtab->statics_offset, psymtab->n_static_syms, cu_index, 1); } @@ -839,10 +841,10 @@ public: psyms_seen, cu_index); write_psymbols (psyms_seen, - &objfile->global_psymbols[psymtab->globals_offset], + objfile->global_psymbols.data () + psymtab->globals_offset, psymtab->n_global_syms, cu_index, false, unit_kind::cu); write_psymbols (psyms_seen, - &objfile->static_psymbols[psymtab->statics_offset], + objfile->static_psymbols.data () + psymtab->statics_offset, psymtab->n_static_syms, cu_index, true, unit_kind::cu); } @@ -1200,11 +1202,13 @@ private: struct partial_symtab *psymtab = entry->per_cu.v.psymtab; write_psymbols (info->psyms_seen, - &info->objfile->global_psymbols[psymtab->globals_offset], + (info->objfile->global_psymbols.data () + + psymtab->globals_offset), psymtab->n_global_syms, info->cu_index, false, unit_kind::tu); write_psymbols (info->psyms_seen, - &info->objfile->static_psymbols[psymtab->statics_offset], + (info->objfile->static_psymbols.data () + + psymtab->statics_offset), psymtab->n_static_syms, info->cu_index, true, unit_kind::tu); |