From: Tom Tromey Date: Tue, 17 Jan 2023 00:04:55 +0000 (-0700) Subject: Rearrange block.c to avoid a forward declaration X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4aabc4166430fed52e9a2e4042147e3480f9178a;p=binutils-gdb.git Rearrange block.c to avoid a forward declaration Moving block_initialize_namespace before its callers lets us avoid a forward declaration. --- diff --git a/gdb/block.c b/gdb/block.c index 167cb08e0bb..751f67d30f7 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. */