diff mbox series

[21/28] Simplify block_lookup_symbol_primary

Message ID	20250311-search-in-psyms-v1-21-d73d9be20983@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CE6CE3857C7F From: Tom Tromey <tom@tromey.com> Date: Tue, 11 Mar 2025 08:12:57 -0600 Subject: [PATCH 21/28] Simplify block_lookup_symbol_primary MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250311-search-in-psyms-v1-21-d73d9be20983@tromey.com> References: <20250311-search-in-psyms-v1-0-d73d9be20983@tromey.com> In-Reply-To: <20250311-search-in-psyms-v1-0-d73d9be20983@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Precedence: list Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org
Series	Search symbols via quick API \| [00/28] Search symbols via quick API [01/28] Add another minor hack to cooked_index_entry::full_name [02/28] Change ada_decode to preserve upper-case in some situations [03/28] Emit some type declarations in .gdb_index [04/28] Ada import functions not in index [05/28] Fix index's handling of DW_TAG_imported_declaration [06/28] Put all CTF symbols in global scope [07/28] Restore "ingestion" of .debug_str when writing .debug_names [08/28] Entries from anon-struct.exp not in cooked index [09/28] Remove dwarf2_per_cu_data::mark [10/28] Have expand_symtabs_matching work for already-expanded CUs [11/28] Rewrite the .gdb_index reader [12/28] Convert default_collect_symbol_completion_matches_break_on [13/28] Convert gdbpy_lookup_static_symbols [14/28] Convert ada_add_global_exceptions [15/28] Convert ada_language_defn::collect_symbol_completion_matches [16/28] Convert ada-lang.c:map_matching_symbols [17/28] Remove expand_symtabs_matching [18/28] Simplify basic_lookup_transparent_type [19/28] Remove objfile::expand_symtabs_for_function [20/28] Convert linespec.c:iterate_over_all_matching_symtabs [21/28] Simplify block_lookup_symbol_primary [22/28] Pass lookup_name_info to block_lookup_symbol_primary [23/28] Simplify block_lookup_symbol [24/28] Add best_symbol_tracker [25/28] Convert lookup_symbol_via_quick_fns [26/28] Convert lookup_symbol_in_objfile [27/28] Make dw_expand_symtabs_matching_file_matcher static [28/28] Remove enter_symbol_lookup

Checks

Context	Check	Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64	fail	Patch failed to apply
linaro-tcwg-bot/tcwg_gdb_build--master-arm	fail	Patch failed to apply

Commit Message

Tom Tromey March 11, 2025, 2:12 p.m. UTC

  This simplifies block_lookup_symbol_primary by using
block_iterator_range.
---
 gdb/block.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/gdb/block.c b/gdb/block.c
index cf7ca6785b0c9ef4f3d809a245261d18ffaf06d8..2c07b38f8f806b8a154eb42adbd3f53a3535c57f 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -721,20 +721,14 @@  struct symbol *
 block_lookup_symbol_primary (const struct block *block, const char *name,
 			     const domain_search_flags domain)
 {
-  struct symbol *sym, *other;
-  struct mdict_iterator mdict_iter;
-
   lookup_name_info lookup_name (name, symbol_name_match_type::FULL);
 
   /* Verify BLOCK is STATIC_BLOCK or GLOBAL_BLOCK.  */
   gdb_assert (block->superblock () == NULL
 	      || block->superblock ()->superblock () == NULL);
 
-  other = NULL;
-  for (sym = mdict_iter_match_first (block->multidict (), lookup_name,
-				     &mdict_iter);
-       sym != NULL;
-       sym = mdict_iter_match_next (lookup_name, &mdict_iter))
+  symbol *other = nullptr;
+  for (symbol *sym : block_iterator_range (block, &lookup_name))
     {
       /* With the fix for PR gcc/debug/91507, we get for:
 	 ...