From patchwork Tue Mar 11 14:13:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 107692 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 438983857B91 for ; Tue, 11 Mar 2025 14:25:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 438983857B91 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=bhhe78EM X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id 0EE77385781A for ; Tue, 11 Mar 2025 14:13:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0EE77385781A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0EE77385781A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702407; cv=none; b=LLSNQe/SREZ+nzhoyhdI7+TehWyPUx0X2rFva9wcei6OmBhhm+rYQvHQpKRjSDmJhJ8Rsi7SL1cxY2FjyHDnVkQpv0Zx8RSPyakApwUUgJVMz2N0db0fEIkhBnHUKGA0x7zMY/iqSlZf1Doe1ktN2YYTb3mW9TDC/1bc1wgKnNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702407; c=relaxed/simple; bh=yg7YEFyOj29u6cIaQel7e7j3dLWlGzXs2E4pk53zVSs=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Jt+bjeMOwmMhT1+FEy3f2HoSaEkkVj6F/3YP+MEZ6Ok8km9EjLKo711lh2TSh4Pe9+IQ2XVBOhlN0vRV5ZQQ1JQD8BOmQpxQa7RoQKnqNMJiCltkOrNIdxjJOprjj1SywQjPau5O1CRcz1SljVI1yyCBmA7caPVAPexsCt+/dYo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6010a.ext.cloudfilter.net ([10.0.30.248]) by cmsmtp with ESMTPS id rysitMOrVWuHKs0Lotw0ZY; Tue, 11 Mar 2025 14:12:56 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id s0LmtktyKZozcs0LmthBQU; Tue, 11 Mar 2025 14:12:54 +0000 X-Authority-Analysis: v=2.4 cv=GvNE+F1C c=1 sm=1 tr=0 ts=67d044e7 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=GgbQac-mxtYejq7yYfIA:9 a=QEXdDO2ut3YA:10 a=6Ogn3jAGHLSNbaov7Orx:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=wgLUfJs4YR27tMYvuKz8g9ToTpYdQ42gXl0cMD+f0j8=; b=bhhe78EMhVBvpLlLi4G8aYTBGp RIb93P7BCsK5lwuv3GormeBme6DX680X/441TFMBrTmMExsW8OpVHKWfEvCX9q3f2RGhzwqlc0Bma N7phrSFzeVOnzfpoNBmGxytPx; Received: from 97-118-51-80.hlrn.qwest.net ([97.118.51.80]:33770 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1ts0Lm-000000003jP-0XU3; Tue, 11 Mar 2025 08:12:54 -0600 From: Tom Tromey Date: Tue, 11 Mar 2025 08:13:00 -0600 Subject: [PATCH 24/28] Add best_symbol_tracker MIME-Version: 1.0 Message-Id: <20250311-search-in-psyms-v1-24-d73d9be20983@tromey.com> References: <20250311-search-in-psyms-v1-0-d73d9be20983@tromey.com> In-Reply-To: <20250311-search-in-psyms-v1-0-d73d9be20983@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 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.118.51.80 X-Source-L: No X-Exim-ID: 1ts0Lm-000000003jP-0XU3 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-51-80.hlrn.qwest.net (prentzel.local) [97.118.51.80]:33770 X-Source-Auth: tom+tromey.com X-Email-Count: 25 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfNsiPLb41i0x01ncrTtDB7D0S6ZA8wnUMbNGmRqIqwIbXSd3JfU561qKkVIufasP9QS2d1MOnTu9ZbBN5kAUMY3TPNXksTHwyFlOo+Acl2UadvDG+kXd dkA9CJoZGDQL3VmLKu4suExYgav778dgAk0Qx6B3zQf7wMq/6NdKt8X5ba1teXoYiYUkTFgyAb5RUa09ghEVsfCEpOKUzUbFET0= X-Spam-Status: No, score=-3016.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_LOTSOFHASH, RCVD_IN_BARRACUDACENTRAL, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org This adds a new best_symbol_tracker struct. This is used to implement the "best symbol" logic that is used sometimes in symtab.c. This approach makes it simpler and more efficient to track the "best" symbol when searching across multiple blocks. --- gdb/block.c | 29 ++++++++++++++++++++++------- gdb/block.h | 27 ++++++++++++++++++++------- gdb/symtab.c | 33 +++++++-------------------------- 3 files changed, 49 insertions(+), 40 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index d8f8bf56de7b1498ae3f89650a3c86c4eafe3bfe..27295168ba564334e5c50c98ad20c66bf2b21aa2 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -669,7 +669,11 @@ block_lookup_symbol (const struct block *block, const lookup_name_info &name, const domain_search_flags domain) { if (!block->function ()) - return block_lookup_symbol_primary (block, name, domain); + { + best_symbol_tracker tracker; + tracker.search (nullptr, block, name, domain); + return tracker.currently_best.symbol; + } else { /* Note that parameter symbols do not always show up last in the @@ -700,12 +704,12 @@ block_lookup_symbol (const struct block *block, const lookup_name_info &name, /* See block.h. */ -struct symbol * -block_lookup_symbol_primary (const struct block *block, +bool +best_symbol_tracker::search (compunit_symtab *symtab, + const struct block *block, const lookup_name_info &name, const domain_search_flags domain) { - symbol *other = nullptr; for (symbol *sym : block_iterator_range (block, &name)) { /* With the fix for PR gcc/debug/91507, we get for: @@ -736,17 +740,28 @@ block_lookup_symbol_primary (const struct block *block, the only option to make this work is improve the fallback to use the size of the minimal symbol. Filed as PR exp/24989. */ if (best_symbol (sym, domain)) - return sym; + { + best_symtab = symtab; + currently_best = { sym, block }; + return true; + } /* This is a bit of a hack, but 'matches' might ignore STRUCT vs VAR domain symbols. So if a matching symbol is found, make sure there is no "better" matching symbol, i.e., one with exactly the same domain. PR 16253. */ if (sym->matches (domain)) - other = better_symbol (other, sym, domain); + { + symbol *better = better_symbol (sym, currently_best.symbol, domain); + if (better != currently_best.symbol) + { + best_symtab = symtab; + currently_best = { better, block }; + } + } } - return other; + return false; } /* See block.h. */ diff --git a/gdb/block.h b/gdb/block.h index c348c7fdcc4088e7f5c912e49c387e2c650eda45..b1daed216c956043b63ee99d8418607b417593ae 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -630,14 +630,27 @@ extern struct symbol *block_lookup_symbol (const struct block *block, const lookup_name_info &name, const domain_search_flags domain); -/* Search BLOCK for symbol NAME in DOMAIN but only in primary symbol table of - BLOCK. BLOCK must be STATIC_BLOCK or GLOBAL_BLOCK. Function is useful if - one iterates all global/static blocks of an objfile. */ +/* When searching for a symbol, the "best" symbol is preferred over + one that is merely acceptable. See 'best_symbol'. This class + keeps track of this distinction while searching. */ -extern struct symbol *block_lookup_symbol_primary - (const struct block *block, - const lookup_name_info &name, - const domain_search_flags domain); +struct best_symbol_tracker +{ + /* The symtab in which the currently best symbol appears. */ + compunit_symtab *best_symtab = nullptr; + + /* The currently best (really "better") symbol. */ + block_symbol currently_best {}; + + /* Search BLOCK (which must have come from SYMTAB) for a symbol + matching NAME and DOMAIN. When a symbol is found, update + 'currently_best'. If a best symbol is found, return true. + Otherwise, return false. SYMTAB can be nullptr if the caller + does not care about this tracking. */ + bool search (compunit_symtab *symtab, + const block *block, const lookup_name_info &name, + domain_search_flags domain); +}; /* Find symbol NAME in BLOCK and in DOMAIN. This will return a matching symbol whose type is not a "opaque", see TYPE_IS_OPAQUE. diff --git a/gdb/symtab.c b/gdb/symtab.c index eeafcaab49df8ad727980ff99e9e2a8c52043abd..14bc59fc2bfe6f04a22d9fb1b5bfab0f6b13c5e6 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2366,44 +2366,25 @@ lookup_symbol_in_objfile_symtabs (struct objfile *objfile, name, domain_name (domain).c_str ()); lookup_name_info lookup_name (name, symbol_name_match_type::FULL); - struct block_symbol other; - other.symbol = NULL; + best_symbol_tracker accum; for (compunit_symtab *cust : objfile->compunits ()) { const struct blockvector *bv; const struct block *block; - struct block_symbol result; bv = cust->blockvector (); block = bv->block (block_index); - result.symbol = block_lookup_symbol_primary (block, lookup_name, domain); - result.block = block; - if (result.symbol == NULL) - continue; - if (best_symbol (result.symbol, domain)) - { - other = result; - break; - } - if (result.symbol->matches (domain)) - { - struct symbol *better - = better_symbol (other.symbol, result.symbol, domain); - if (better != other.symbol) - { - other.symbol = better; - other.block = block; - } - } + if (accum.search (cust, block, lookup_name, domain)) + break; } - if (other.symbol != NULL) + if (accum.currently_best.symbol != nullptr) { symbol_lookup_debug_printf_v ("lookup_symbol_in_objfile_symtabs (...) = %s (block %s)", - host_address_to_string (other.symbol), - host_address_to_string (other.block)); - return other; + host_address_to_string (accum.currently_best.symbol), + host_address_to_string (accum.currently_best.block)); + return accum.currently_best; } symbol_lookup_debug_printf_v