From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 05/27] Don't allow NULL as an argument to block_static_block
Date: Fri, 20 Jan 2023 14:45:56 -0700 [thread overview]
Message-ID: <20230120214618.3236224-6-tom@tromey.com> (raw)
In-Reply-To: <20230120214618.3236224-1-tom@tromey.com>
block_static_block has special behavior when the block is NULL.
Remove this and patch up the callers instead.
---
gdb/ada-lang.c | 6 +++++-
gdb/block.c | 4 ++--
gdb/compile/compile-c-symbols.c | 8 ++++++--
gdb/compile/compile-cplus-symbols.c | 4 +++-
gdb/cp-support.c | 6 +++++-
gdb/symtab.c | 13 +++++++++----
6 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 40f85914a56..dfcd9a5fcd1 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -13815,7 +13815,11 @@ class ada_language : public language_defn
{
struct block_symbol sym;
- sym = ada_lookup_symbol (name, block_static_block (block), domain);
+ sym = ada_lookup_symbol (name,
+ (block == nullptr
+ ? nullptr
+ : block_static_block (block)),
+ domain);
if (sym.symbol != NULL)
return sym;
diff --git a/gdb/block.c b/gdb/block.c
index 97a0214e037..d21729f069d 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -364,12 +364,12 @@ block_set_using (struct block *block,
}
/* Return the static block associated to BLOCK. Return NULL if block
- is NULL or if block is a global block. */
+ is a global block. */
const struct block *
block_static_block (const struct block *block)
{
- if (block == NULL || block->superblock () == NULL)
+ if (block->superblock () == NULL)
return NULL;
while (block->superblock ()->superblock () != NULL)
diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c
index 00ac4523f86..79490b811c3 100644
--- a/gdb/compile/compile-c-symbols.c
+++ b/gdb/compile/compile-c-symbols.c
@@ -212,7 +212,6 @@ static void
convert_symbol_sym (compile_c_instance *context, const char *identifier,
struct block_symbol sym, domain_enum domain)
{
- const struct block *static_block;
int is_local_symbol;
/* If we found a symbol and it is not in the static or global
@@ -227,7 +226,9 @@ convert_symbol_sym (compile_c_instance *context, const char *identifier,
}
*/
- static_block = block_static_block (sym.block);
+ const struct block *static_block = nullptr;
+ if (sym.block != nullptr)
+ static_block = block_static_block (sym.block);
/* STATIC_BLOCK is NULL if FOUND_BLOCK is the global block. */
is_local_symbol = (sym.block != static_block && static_block != NULL);
if (is_local_symbol)
@@ -613,6 +614,9 @@ generate_c_for_variable_locations (compile_instance *compiler,
const struct block *block,
CORE_ADDR pc)
{
+ if (block == nullptr)
+ return {};
+
const struct block *static_block = block_static_block (block);
/* If we're already in the static or global block, there is nothing
diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index 2df68b7dd32..45a76eef303 100644
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -239,7 +239,9 @@ convert_symbol_sym (compile_cplus_instance *instance,
}
*/
- const struct block *static_block = block_static_block (sym.block);
+ const struct block *static_block = nullptr;
+ if (sym.block != nullptr)
+ static_block = block_static_block (sym.block);
/* STATIC_BLOCK is NULL if FOUND_BLOCK is the global block. */
bool is_local_symbol = (sym.block != static_block && static_block != nullptr);
if (is_local_symbol)
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index b7ed2101b78..08f7c2b4140 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1306,7 +1306,8 @@ add_symbol_overload_list_namespace (const char *func_name,
}
/* Look in the static block. */
- block = block_static_block (get_selected_block (0));
+ block = get_selected_block (0);
+ block = block == nullptr ? nullptr : block_static_block (block);
if (block)
add_symbol_overload_list_block (name, block, overload_list);
@@ -1456,6 +1457,9 @@ add_symbol_overload_list_qualified (const char *func_name,
add_symbol_overload_list_block (func_name, b, overload_list);
surrounding_static_block = block_static_block (get_selected_block (0));
+ surrounding_static_block = (surrounding_static_block == nullptr
+ ? nullptr
+ : block_static_block (surrounding_static_block));
/* Go through the symtabs and check the externs and statics for
symbols which match. */
diff --git a/gdb/symtab.c b/gdb/symtab.c
index b3445133c8c..0e522b2c7f9 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2179,13 +2179,15 @@ lookup_local_symbol (const char *name,
const domain_enum domain,
enum language language)
{
+ if (block == nullptr)
+ return {};
+
struct symbol *sym;
const struct block *static_block = block_static_block (block);
const char *scope = block_scope (block);
- /* Check if either no block is specified or it's a global block. */
-
- if (static_block == NULL)
+ /* Check if it's a global block. */
+ if (static_block == nullptr)
return {};
while (block != static_block)
@@ -2484,6 +2486,9 @@ lookup_symbol_in_static_block (const char *name,
const struct block *block,
const domain_enum domain)
{
+ if (block == nullptr)
+ return {};
+
const struct block *static_block = block_static_block (block);
struct symbol *sym;
@@ -5855,7 +5860,7 @@ default_collect_symbol_completion_matches_break_on
visible from current context. */
b = get_selected_block (0);
- surrounding_static_block = block_static_block (b);
+ surrounding_static_block = b == nullptr ? nullptr : block_static_block (b);
surrounding_global_block = block_global_block (b);
if (surrounding_static_block != NULL)
while (b != surrounding_static_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 ` Tom Tromey [this message]
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 ` [PATCH 16/27] Store 'name' in block_iterator Tom Tromey
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-6-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).