public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Don't allow NULL as an argument to block_static_block
@ 2023-02-19 23:37 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2023-02-19 23:37 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=780040961370cb7a9849b83553f03bf7d2f0f9df
commit 780040961370cb7a9849b83553f03bf7d2f0f9df
Author: Tom Tromey <tom@tromey.com>
Date: Thu Jan 19 17:20:09 2023 -0700
Don't allow NULL as an argument to block_static_block
block_static_block has special behavior when the block is NULL.
Remove this and patch up the callers instead.
Diff:
---
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 75c5f5ebd6e..0198598982c 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -13795,7 +13795,11 @@ public:
{
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 6faff0eee06..7af0bff5681 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 039aee34ab7..c183d089d70 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 6a96f9f213e..f7767c980c5 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1307,7 +1307,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);
@@ -1457,6 +1458,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 bd73c521b1a..598e243b24c 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2155,13 +2155,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)
@@ -2458,6 +2460,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;
@@ -5825,7 +5830,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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-19 23:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-19 23:37 [binutils-gdb] Don't allow NULL as an argument to block_static_block Tom Tromey
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).