Simplify block_lookup_symbol_primary

This simplifies block_lookup_symbol_primary by using
block_iterator_range.

Acked-By: Simon Marchi <simon.marchi@efficios.com>

diff --git a/gdb/block.c b/gdb/block.c
index 5ed253418fddc4a5723bcc8d1799e0016ef9129c..b653abccb77ad52eb045ec064383ca98808d0a2c 100644 (file)
--- 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:
         ...