From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 16/27] Store 'name' in block_iterator
Date: Fri, 20 Jan 2023 14:46:07 -0700 [thread overview]
Message-ID: <20230120214618.3236224-17-tom@tromey.com> (raw)
In-Reply-To: <20230120214618.3236224-1-tom@tromey.com>
This changes the block_iterator to store the 'name' that is used by
block_iter_match_next. This avoids any problem where the name could
be passed inconsistently, and also makes the subsequent patches easier
to understand.
---
gdb/ada-lang.c | 2 +-
gdb/block.c | 22 ++++++++++++----------
gdb/block.h | 10 ++++++----
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 57676f0de95..c04d75590fb 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -6087,7 +6087,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 8aa0e676894..e56c95013b8 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 9bc80490d7c..5fc41c6df02 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. */
--
2.39.0
next prev parent reply other threads:[~2023-01-20 21:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 21:45 [PATCH 00/27] C++-ify struct block Tom Tromey
2023-01-20 21:45 ` [PATCH 01/27] Rearrange block.c to avoid a forward declaration Tom Tromey
2023-01-20 21:45 ` [PATCH 02/27] Avoid extra allocations in block Tom Tromey
2023-01-20 21:45 ` [PATCH 03/27] Don't allow NULL as an argument to block_scope Tom Tromey
2023-01-20 21:45 ` [PATCH 04/27] Don't allow NULL as an argument to block_using Tom Tromey
2023-01-20 21:45 ` [PATCH 05/27] Don't allow NULL as an argument to block_static_block Tom Tromey
2023-01-20 21:45 ` [PATCH 06/27] Don't allow NULL as an argument to block_global_block Tom Tromey
2023-01-20 21:45 ` [PATCH 07/27] Convert block_objfile to method Tom Tromey
2023-01-20 21:45 ` [PATCH 08/27] Convert block_gdbarch " Tom Tromey
2023-01-20 21:46 ` [PATCH 09/27] Convert block_inlined_p " Tom Tromey
2023-01-20 21:46 ` [PATCH 10/27] Convert more block functions to methods Tom Tromey
2023-01-20 21:46 ` [PATCH 11/27] Convert block_linkage_function to method Tom Tromey
2023-01-20 21:46 ` [PATCH 12/27] Convert block_containing_function " Tom Tromey
2023-01-20 21:46 ` [PATCH 13/27] Convert block_static_block and block_global_block to methods Tom Tromey
2023-01-20 21:46 ` [PATCH 14/27] Convert set_block_compunit_symtab to method Tom Tromey
2023-01-20 21:46 ` [PATCH 15/27] Convert block_static_link " Tom Tromey
2023-01-20 21:46 ` Tom Tromey [this message]
2023-01-20 21:46 ` [PATCH 17/27] Combine both styles of block iterator Tom Tromey
2023-01-20 21:46 ` [PATCH 18/27] Introduce a block iterator wrapper Tom Tromey
2023-01-20 21:46 ` [PATCH 19/27] Convert explicit iterator uses to foreach Tom Tromey
2023-01-20 21:46 ` [PATCH 20/27] Remove ALL_BLOCK_SYMBOLS_WITH_NAME Tom Tromey
2023-01-20 21:46 ` [PATCH 21/27] Remove ALL_BLOCK_SYMBOLS Tom Tromey
2023-01-20 21:46 ` [PATCH 22/27] Fix memory leak in mdebugread.c Tom Tromey
2023-01-20 21:46 ` [PATCH 23/27] Use 'new' for block and global_block Tom Tromey
2023-01-20 21:46 ` [PATCH 24/27] Have global_block inherit from block Tom Tromey
2023-01-20 21:46 ` [PATCH 25/27] Remove allocate_block and allocate_global_block Tom Tromey
2023-01-20 21:46 ` [PATCH 26/27] Make block members 'private' Tom Tromey
2023-01-20 21:46 ` [PATCH 27/27] Convert contained_in to method Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230120214618.3236224-17-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).