From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id iE9fLSrP7WcgkCQAWB0awg (envelope-from ) for ; Wed, 02 Apr 2025 19:58:34 -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=LNdXxCIP; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id B5B351E0C3; Wed, 2 Apr 2025 19:58:34 -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 680D91E0C0 for ; Wed, 2 Apr 2025 19:58:34 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 215AC385AC38 for ; Wed, 2 Apr 2025 23:58:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 215AC385AC38 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=LNdXxCIP Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id 3ED33385B51B for ; Wed, 2 Apr 2025 23:45:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3ED33385B51B 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 3ED33385B51B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1743637520; cv=none; b=sWCc/BG4EntiQEkfGJlXe7l4B14H4W0Ip1ErNdghKmXswbHL6WYAsCIS+zFohyeR98QvQKZovMnQ0oewiRQnlwnQhrgIR3gCAsDaCeF/+GV2iimHMho5c577+3A7Ef8NJJWGPq5CcGAa4I51mBKWKpOqzsLh/w5QqaE36szYrhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1743637520; c=relaxed/simple; bh=Dwm1KuYXPjaxIkOQJm3Rtl2H39JR1vOEpPuuXVE9YY0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Gi5OuT2TcznFB/XGJ2XpD2h08A3bEaHxNBEhWP8S/XV9juhcOFgORGNdMA2Lr7tesq8SJUL7X2ZL90aomFbsJqICq2do5ZHV8pCpX/XONeZxhO1EesAbk3/DkPk4L0a1LOv6bOEDe6Xo6SBzmHSQp8Ag3+4RwSqRpcrx5Pvui68= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3ED33385B51B Received: from eig-obgw-5003a.ext.cloudfilter.net ([10.0.29.159]) by cmsmtp with ESMTPS id 060FunE7wzZPa07louJzEG; Wed, 02 Apr 2025 23:45:20 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 07lnuSr0dliBX07lnup7NJ; Wed, 02 Apr 2025 23:45:19 +0000 X-Authority-Analysis: v=2.4 cv=bOXdI++Z c=1 sm=1 tr=0 ts=67edcc0f a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=ItBw4LHWJt0A:10 a=CCpqsmhAAAAA:8 a=ZWlKykVnwNkTDqDuJ9UA:9 a=QEXdDO2ut3YA:10 a=ul9cdbp4aOFLsgKbc677:22 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=7Z+MzYLfoiwA9KLBK/Zk/rmteQ4B+VBe8PhD+GpyaLY=; b=LNdXxCIPRW+2PjUozBvT1sRwHU fskvRGJP7C1tyhV1Leq555LyKHMoqsQdIggD+NNaGX5VlMXA1Vbu5Rf+FLhiu8K2NELNvXtkvK37J gXNLecqmoJKAFy9LKi2HNFubC; 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 1u07lm-000000014hd-3gsC; Wed, 02 Apr 2025 17:45:18 -0600 From: Tom Tromey Date: Wed, 02 Apr 2025 17:45:19 -0600 Subject: [PATCH v2 20/28] Convert linespec.c:iterate_over_all_matching_symtabs MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250402-search-in-psyms-v2-20-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: 1u07lm-000000014hd-3gsC 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: 21 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfH9H4m7K+qiwBHArYAGczYkL/DZ15w4rXBeMA5fWDtqq5SpvZzZTIYbE8JU42K5AOQ6Opdpo+UGPVikCc2hhBOmZuzproZMnVyAvgHUJ5K3ldKZOt0gz YJSScD7Boj7OkPoJ2bmweRU1Xm67g8UruA6pBc7857pRSFzbVQ850Bwvx2iG/krhAIp3CoLWBvdhtGpyGMEqPjy8hGmm9RV+Eio= 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 converts linespec.c:iterate_over_all_matching_symtabs to the callback approach, merging the search loop and the call to expand_symtabs_matching. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16994 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16998 --- gdb/linespec.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index 5eef96c44e7dc283c3855690359fd718fe2c0a55..b500930b1feeb447aac81e45ba51439a021c4b48 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -1134,12 +1134,7 @@ iterate_over_all_matching_symtabs for (objfile *objfile : pspace->objfiles ()) { - objfile->expand_symtabs_matching (NULL, &lookup_name, NULL, NULL, - (SEARCH_GLOBAL_BLOCK - | SEARCH_STATIC_BLOCK), - domain); - - for (compunit_symtab *cu : objfile->compunits ()) + auto expand_callback = [&] (compunit_symtab *cu) { struct symtab *symtab = cu->primary_filetab (); @@ -1166,7 +1161,15 @@ iterate_over_all_matching_symtabs }); } } - } + + return true; + }; + + objfile->expand_symtabs_matching (nullptr, &lookup_name, + nullptr, expand_callback, + (SEARCH_GLOBAL_BLOCK + | SEARCH_STATIC_BLOCK), + domain); } } } -- 2.46.1