From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 541423858C54 for ; Fri, 20 Jan 2023 21:46:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 541423858C54 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 947F610040228 for ; Fri, 20 Jan 2023 21:46:32 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id IzDUpfnMjNX2aIzDUpTFxL; Fri, 20 Jan 2023 21:46:32 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=63cb0bb8 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=TOjmDAImc5F25ATAshwA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=eIx14nMSAkmBhDG4yv+iyt7xyVJInwMrrXr6KP7qvzo=; b=IMkJejSKXC/EzSrubYuNZkdSRd kS/51Ymn6X7FIhivj1GBGYaL3tzpSBonx5PaOcQ5fsVrE4Q3HEXxxKCWLd9ljZjrwNx01mP3zkSs0 srvHc0HOeV1rSpMtBiw11XGGY; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:36374 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pIzDU-001G7B-7r; Fri, 20 Jan 2023 14:46:32 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 05/27] Don't allow NULL as an argument to block_static_block Date: Fri, 20 Jan 2023 14:45:56 -0700 Message-Id: <20230120214618.3236224-6-tom@tromey.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120214618.3236224-1-tom@tromey.com> References: <20230120214618.3236224-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1pIzDU-001G7B-7r X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:36374 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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