From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wIGkN8zO7WcgkCQAWB0awg (envelope-from ) for ; Wed, 02 Apr 2025 19:57:00 -0400 Authentication-Results: simark.ca; 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=vwM85UOu; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id E09221E0C3; Wed, 2 Apr 2025 19:57:00 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 9419E1E0C0 for ; Wed, 2 Apr 2025 19:57:00 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 33EBD3857833 for ; Wed, 2 Apr 2025 23:57:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33EBD3857833 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=vwM85UOu Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 86FCD384CB82 for ; Wed, 2 Apr 2025 23:45:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 86FCD384CB82 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 86FCD384CB82 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1743637520; cv=none; b=Nc0VYIVyVdE6fLx87kkoE/DnCzTvikJXJapY0KsEnekHIbJR3AHnagJ6ptBK5Ve9U723mn78ilbnK6CGYdPTdjL3VmacOZZTpK0JtarJr19/MTIRKq/mnk9mEqjFnaBvCgUknOoYHQ0bJWL9EkaRjD17d5OLy137b3qZdPIi5Vw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1743637520; c=relaxed/simple; bh=D0rruJJqTq8YHpSIWIbWySQCPdXl4Gbxr7Uj8aBrf/o=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=uBRlgC/+286y24Nd9FaiaSEXyIYR6muRlJ2+JcyZ0PJHlI50AOiuLimw5lHpottZja0YYI4dmjokNUFEvInpW0/bU7hcijw0eWPOoi9fR030Psju2JJWgLsiI0fRdi9oWX4IAVF/5790vn9RuDWBZs1OGzbi20fiK+qwscn7n5c= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 86FCD384CB82 Received: from eig-obgw-5006a.ext.cloudfilter.net ([10.0.29.179]) by cmsmtp with ESMTPS id zzdDtlxTjVkcR07louKGZ7; Wed, 02 Apr 2025 23:45:20 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 07lnuw72dnOa107lnuC3Hv; Wed, 02 Apr 2025 23:45:20 +0000 X-Authority-Analysis: v=2.4 cv=Z83qHmRA c=1 sm=1 tr=0 ts=67edcc10 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=ItBw4LHWJt0A:10 a=ppPOZcq4FjCqRJXtrC0A: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=Rw7H8AI3zM97nNsxHTuhEjYDj69Kr3G248b8qC2XANg=; b=vwM85UOu4Vk0j2zLVOhug9vEiV M2UyW8hQON8Xdep/hDbfFwuDBd9UAL5O14jC4QQBRwNtpCi4q4UocLXiAjXV2K93K192UW3QikNYw djc6GigVPfl4i2GjP2cdlirfm; Received: from 97-122-123-18.hlrn.qwest.net ([97.122.123.18]:56394 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 1u07ln-000000014hd-0o8t; Wed, 02 Apr 2025 17:45:19 -0600 From: Tom Tromey Date: Wed, 02 Apr 2025 17:45:20 -0600 Subject: [PATCH v2 21/28] Simplify block_lookup_symbol_primary MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250402-search-in-psyms-v2-21-ea91704487cb@tromey.com> References: <20250402-search-in-psyms-v2-0-ea91704487cb@tromey.com> In-Reply-To: <20250402-search-in-psyms-v2-0-ea91704487cb@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.122.123.18 X-Source-L: No X-Exim-ID: 1u07ln-000000014hd-0o8t X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-123-18.hlrn.qwest.net (prentzel.local) [97.122.123.18]:56394 X-Source-Auth: tom+tromey.com X-Email-Count: 22 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfDfkZYBUMzhZqo49qVc4cC013f58YZxTE/q2StANU+IDafEpWZENdm3b2vvPVdNo/k2LTcrD64blmu3KiRwB7XVI+9skUptl1KakIOPBB1ztH3LHiPvD K+zsp9z7LyPnSfLWqk25FE/CmlrbFOq2xOuelT1P36Z+LQCoT4bwDVGAgLOxuWne3DPia7vBpBJ8tPzW90hFM98HbpTGj3eBXjg= 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~public-inbox=simark.ca@sourceware.org This simplifies block_lookup_symbol_primary by using block_iterator_range. --- gdb/block.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index cf7ca6785b0c9ef4f3d809a245261d18ffaf06d8..2c07b38f8f806b8a154eb42adbd3f53a3535c57f 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -721,20 +721,14 @@ struct symbol * block_lookup_symbol_primary (const struct block *block, const char *name, const domain_search_flags domain) { - struct symbol *sym, *other; - struct mdict_iterator mdict_iter; - lookup_name_info lookup_name (name, symbol_name_match_type::FULL); /* Verify BLOCK is STATIC_BLOCK or GLOBAL_BLOCK. */ gdb_assert (block->superblock () == NULL || block->superblock ()->superblock () == NULL); - other = NULL; - for (sym = mdict_iter_match_first (block->multidict (), lookup_name, - &mdict_iter); - sym != NULL; - sym = mdict_iter_match_next (lookup_name, &mdict_iter)) + symbol *other = nullptr; + for (symbol *sym : block_iterator_range (block, &lookup_name)) { /* With the fix for PR gcc/debug/91507, we get for: ... -- 2.46.1