diff options
author | Tom Tromey <tom@tromey.com> | 2023-01-16 17:04:55 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2023-02-19 12:51:05 -0700 |
commit | 4aabc4166430fed52e9a2e4042147e3480f9178a (patch) | |
tree | 529798f91328b6994d076d64b4407d53bc3ecb28 | |
parent | 0ea8d78bd3ff77499e9d7c19d7a40cea680e89de (diff) | |
download | gdb-4aabc4166430fed52e9a2e4042147e3480f9178a.zip gdb-4aabc4166430fed52e9a2e4042147e3480f9178a.tar.gz gdb-4aabc4166430fed52e9a2e4042147e3480f9178a.tar.bz2 |
Rearrange block.c to avoid a forward declaration
Moving block_initialize_namespace before its callers lets us avoid a
forward declaration.
-rw-r--r-- | gdb/block.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/gdb/block.c b/gdb/block.c index 167cb08..751f67d 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -37,9 +37,6 @@ struct block_namespace_info : public allocate_on_obstack struct using_direct *using_decl = nullptr; }; -static void block_initialize_namespace (struct block *block, - struct obstack *obstack); - /* See block.h. */ struct objfile * @@ -305,6 +302,16 @@ block_scope (const struct block *block) return ""; } +/* If block->namespace_info () is NULL, allocate it via OBSTACK and + initialize its members to zero. */ + +static void +block_initialize_namespace (struct block *block, struct obstack *obstack) +{ + if (block->namespace_info () == NULL) + block->set_namespace_info (new (obstack) struct block_namespace_info ()); +} + /* Set BLOCK's scope member to SCOPE; if needed, allocate memory via OBSTACK. (It won't make a copy of SCOPE, however, so that already has to be allocated correctly.) */ @@ -344,16 +351,6 @@ block_set_using (struct block *block, block->namespace_info ()->using_decl = using_decl; } -/* If block->namespace_info () is NULL, allocate it via OBSTACK and - initialize its members to zero. */ - -static void -block_initialize_namespace (struct block *block, struct obstack *obstack) -{ - if (block->namespace_info () == NULL) - block->set_namespace_info (new (obstack) struct block_namespace_info ()); -} - /* Return the static block associated to BLOCK. Return NULL if block is NULL or if block is a global block. */ |