diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/dwarf2/cooked-index.h | 11 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 8 |
2 files changed, 14 insertions, 5 deletions
diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h index 439cbb1..f3c2648 100644 --- a/gdb/dwarf2/cooked-index.h +++ b/gdb/dwarf2/cooked-index.h @@ -295,6 +295,14 @@ public: explicit cooked_index_vector (vec_type &&vec); DISABLE_COPY_AND_ASSIGN (cooked_index_vector); + /* Wait until the finalization of the entire cooked_index_vector is + done. */ + void wait () + { + for (auto &item : m_vector) + item->wait (); + } + ~cooked_index_vector () { /* The 'finalize' methods may be run in a different thread. If @@ -303,8 +311,7 @@ public: complete avoids this problem; and the cost seems ignorable because creating and immediately destroying the debug info is a relatively rare thing to do. */ - for (auto &item : m_vector) - item->wait (); + wait (); } /* A range over a vector of subranges. */ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 5ca787c..bcd0110 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18569,6 +18569,11 @@ cooked_index_functions::expand_symtabs_matching if (per_objfile->per_bfd->index_table == nullptr) return true; + cooked_index_vector *table + = (static_cast<cooked_index_vector *> + (per_objfile->per_bfd->index_table.get ())); + table->wait (); + dw_expand_symtabs_matching_file_matcher (per_objfile, file_matcher); /* This invariant is documented in quick-functions.h. */ @@ -18604,9 +18609,6 @@ cooked_index_functions::expand_symtabs_matching language_ada }; - cooked_index_vector *table - = (static_cast<cooked_index_vector *> - (per_objfile->per_bfd->index_table.get ())); for (enum language lang : unique_styles) { std::vector<gdb::string_view> name_vec |