diff options
| -rw-r--r-- | gdb/ada-lang.c | 2 | ||||
| -rw-r--r-- | gdb/block.c | 22 | ||||
| -rw-r--r-- | gdb/block.h | 10 |
3 files changed, 19 insertions, 15 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 1f381a2..8b503b3 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -6081,7 +6081,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result, found_sym = false; for (sym = block_iter_match_first (block, lookup_name, &iter); sym != NULL; - sym = block_iter_match_next (lookup_name, &iter)) + sym = block_iter_match_next (&iter)) { if (symbol_matches_domain (sym->language (), sym->domain (), domain)) { diff --git a/gdb/block.c b/gdb/block.c index 8aa0e67..e56c950 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -453,12 +453,14 @@ get_block_compunit_symtab (const struct block *block) static void initialize_block_iterator (const struct block *block, - struct block_iterator *iter) + struct block_iterator *iter, + const lookup_name_info *name = nullptr) { enum block_enum which; struct compunit_symtab *cu; iter->idx = -1; + iter->name = name; if (block->superblock () == NULL) { @@ -585,7 +587,6 @@ block_iterator_next (struct block_iterator *iterator) static struct symbol * block_iter_match_step (struct block_iterator *iterator, - const lookup_name_info &name, int first) { struct symbol *sym; @@ -605,11 +606,11 @@ block_iter_match_step (struct block_iterator *iterator, return NULL; block = cust->blockvector ()->block (iterator->which); - sym = mdict_iter_match_first (block->multidict (), name, + sym = mdict_iter_match_first (block->multidict (), *iterator->name, &iterator->mdict_iter); } else - sym = mdict_iter_match_next (name, &iterator->mdict_iter); + sym = mdict_iter_match_next (*iterator->name, &iterator->mdict_iter); if (sym != NULL) return sym; @@ -629,25 +630,26 @@ block_iter_match_first (const struct block *block, const lookup_name_info &name, struct block_iterator *iterator) { - initialize_block_iterator (block, iterator); + initialize_block_iterator (block, iterator, &name); if (iterator->which == FIRST_LOCAL_BLOCK) return mdict_iter_match_first (block->multidict (), name, &iterator->mdict_iter); - return block_iter_match_step (iterator, name, 1); + return block_iter_match_step (iterator, 1); } /* See block.h. */ struct symbol * -block_iter_match_next (const lookup_name_info &name, - struct block_iterator *iterator) +block_iter_match_next (struct block_iterator *iterator) { + gdb_assert (iterator->name != nullptr); + if (iterator->which == FIRST_LOCAL_BLOCK) - return mdict_iter_match_next (name, &iterator->mdict_iter); + return mdict_iter_match_next (*iterator->name, &iterator->mdict_iter); - return block_iter_match_step (iterator, name, 0); + return block_iter_match_step (iterator, 0); } /* See block.h. */ diff --git a/gdb/block.h b/gdb/block.h index 9bc8049..5fc41c6 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -449,6 +449,9 @@ struct block_iterator const struct block *block; } d; + /* If we're trying to match a name, this will be non-NULL. */ + const lookup_name_info *name; + /* If we're iterating over a single block, this is always -1. Otherwise, it holds the index of the current "included" symtab in the canonical symtab (that is, d.symtab->includes[idx]), with -1 @@ -493,10 +496,9 @@ extern struct symbol *block_iter_match_first (const struct block *block, symbols. Don't call this if you've previously received NULL from block_iterator_match_first or block_iterator_match_next on this iteration. And don't call it unless ITERATOR was created by a - previous call to block_iter_match_first with the same NAME. */ + previous call to block_iter_match_first. */ -extern struct symbol *block_iter_match_next - (const lookup_name_info &name, struct block_iterator *iterator); +extern struct symbol *block_iter_match_next (struct block_iterator *iterator); /* Return true if symbol A is the best match possible for DOMAIN. */ @@ -574,7 +576,7 @@ extern int block_find_non_opaque_type_preferred (struct symbol *sym, #define ALL_BLOCK_SYMBOLS_WITH_NAME(block, name, iter, sym) \ for ((sym) = block_iter_match_first ((block), (name), &(iter)); \ (sym) != NULL; \ - (sym) = block_iter_match_next ((name), &(iter))) + (sym) = block_iter_match_next (&(iter))) /* Given a vector of pairs, allocate and build an obstack allocated blockranges struct for a block. */ |