From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 8F9C23858D20; Sun, 19 Feb 2023 23:37:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F9C23858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676849839; bh=f2Tuprp36zKUYLEhubxx3NiZYw3LRzStuh9xo/H9Ft4=; h=From:To:Subject:Date:From; b=ZzfnzjnYyK2NJXhN+Or2MBOERxCTz2AJXDr0urYNvKoHkXnnQALaaWXVc5wZn2iJs zpCpCRTMRJX9k51QJYCa+QQ/MqsJNUpV6Dr4hmqsrjn58ep7NL8pxHfaoFgN9zgVgd xwop3TZxaZEBoo9v7gPe6PBC5j2Ng7Y9SvYuoSy4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Don't allow NULL as an argument to block_static_block X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 392c1cbd745a575c5894ea33876f255b66a14d89 X-Git-Newrev: 780040961370cb7a9849b83553f03bf7d2f0f9df Message-Id: <20230219233719.8F9C23858D20@sourceware.org> Date: Sun, 19 Feb 2023 23:37:19 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D780040961370= cb7a9849b83553f03bf7d2f0f9df commit 780040961370cb7a9849b83553f03bf7d2f0f9df Author: Tom Tromey Date: Thu Jan 19 17:20:09 2023 -0700 Don't allow NULL as an argument to block_static_block =20 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; =20 - sym =3D ada_lookup_symbol (name, block_static_block (block), domain); + sym =3D ada_lookup_symbol (name, + (block =3D=3D nullptr + ? nullptr + : block_static_block (block)), + domain); if (sym.symbol !=3D NULL) return sym; =20 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, } =20 /* Return the static block associated to BLOCK. Return NULL if block - is NULL or if block is a global block. */ + is a global block. */ =20 const struct block * block_static_block (const struct block *block) { - if (block =3D=3D NULL || block->superblock () =3D=3D NULL) + if (block->superblock () =3D=3D NULL) return NULL; =20 while (block->superblock ()->superblock () !=3D NULL) diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbol= s.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; =20 /* 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, } */ =20 - static_block =3D block_static_block (sym.block); + const struct block *static_block =3D nullptr; + if (sym.block !=3D nullptr) + static_block =3D block_static_block (sym.block); /* STATIC_BLOCK is NULL if FOUND_BLOCK is the global block. */ is_local_symbol =3D (sym.block !=3D static_block && static_block !=3D NU= LL); if (is_local_symbol) @@ -613,6 +614,9 @@ generate_c_for_variable_locations (compile_instance *co= mpiler, const struct block *block, CORE_ADDR pc) { + if (block =3D=3D nullptr) + return {}; + const struct block *static_block =3D block_static_block (block); =20 /* 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-cplu= s-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, } */ =20 - const struct block *static_block =3D block_static_block (sym.block); + const struct block *static_block =3D nullptr; + if (sym.block !=3D nullptr) + static_block =3D block_static_block (sym.block); /* STATIC_BLOCK is NULL if FOUND_BLOCK is the global block. */ bool is_local_symbol =3D (sym.block !=3D static_block && static_block != =3D 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, } =20 /* Look in the static block. */ - block =3D block_static_block (get_selected_block (0)); + block =3D get_selected_block (0); + block =3D block =3D=3D nullptr ? nullptr : block_static_block (block); if (block) add_symbol_overload_list_block (name, block, overload_list); =20 @@ -1457,6 +1458,9 @@ add_symbol_overload_list_qualified (const char *func_= name, add_symbol_overload_list_block (func_name, b, overload_list); =20 surrounding_static_block =3D block_static_block (get_selected_block (0)); + surrounding_static_block =3D (surrounding_static_block =3D=3D nullptr + ? nullptr + : block_static_block (surrounding_static_block)); =20 /* 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 =3D=3D nullptr) + return {}; + struct symbol *sym; const struct block *static_block =3D block_static_block (block); const char *scope =3D block_scope (block); =20 - /* Check if either no block is specified or it's a global block. */ - - if (static_block =3D=3D NULL) + /* Check if it's a global block. */ + if (static_block =3D=3D nullptr) return {}; =20 while (block !=3D static_block) @@ -2458,6 +2460,9 @@ lookup_symbol_in_static_block (const char *name, const struct block *block, const domain_enum domain) { + if (block =3D=3D nullptr) + return {}; + const struct block *static_block =3D block_static_block (block); struct symbol *sym; =20 @@ -5825,7 +5830,7 @@ default_collect_symbol_completion_matches_break_on visible from current context. */ =20 b =3D get_selected_block (0); - surrounding_static_block =3D block_static_block (b); + surrounding_static_block =3D b =3D=3D nullptr ? nullptr : block_static_b= lock (b); surrounding_global_block =3D block_global_block (b); if (surrounding_static_block !=3D NULL) while (b !=3D surrounding_static_block)