From: Simon Marchi Date: Mon, 4 Nov 2024 18:27:34 +0000 (-0500) Subject: gdb: make `cooked_index_storage::get_abbrev_table_cache` return a reference X-Git-Tag: gdb-16-branchpoint~322 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27f442142746e91af5aa4a6fb6d77de567557216;p=thirdparty%2Fbinutils-gdb.git gdb: make `cooked_index_storage::get_abbrev_table_cache` return a reference It can never return nullptr, return a reference instead of a pointer. Change-Id: Ibc6f16eb74dc16059152982600ca9f426d7f80a4 Approved-By: Tom Tromey --- diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h index 6f9311bd108..d1d81f8e2a5 100644 --- a/gdb/dwarf2/cooked-index.h +++ b/gdb/dwarf2/cooked-index.h @@ -377,8 +377,8 @@ public: DISABLE_COPY_AND_ASSIGN (cooked_index_storage); /* Return the current abbrev table_cache. */ - const abbrev_table_cache *get_abbrev_table_cache () const - { return &m_abbrev_table_cache; } + const abbrev_table_cache &get_abbrev_table_cache () const + { return m_abbrev_table_cache; } /* Return the DIE reader corresponding to PER_CU. If no such reader has been registered, return NULL. */ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index b0b2b51fe5f..4c3f8a44442 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -4609,7 +4609,7 @@ process_psymtab_comp_unit (dwarf2_per_cu_data *this_cu, if (reader == nullptr) { cutu_reader new_reader (this_cu, per_objfile, nullptr, nullptr, false, - storage->get_abbrev_table_cache ()); + &storage->get_abbrev_table_cache ()); if (new_reader.comp_unit_die == nullptr || new_reader.dummy_p) return; @@ -16243,7 +16243,7 @@ cooked_indexer::ensure_cu_exists (cutu_reader *reader, if (result == nullptr) { cutu_reader new_reader (per_cu, per_objfile, nullptr, nullptr, false, - m_index_storage->get_abbrev_table_cache ()); + &m_index_storage->get_abbrev_table_cache ()); if (new_reader.dummy_p || new_reader.comp_unit_die == nullptr || !new_reader.comp_unit_die->has_children)