From patchwork Tue Mar 11 14:12:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 107670 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 41F843857B98 for ; Tue, 11 Mar 2025 14:15:16 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) by sourceware.org (Postfix) with ESMTPS id 1BDD03857C5F for ; Tue, 11 Mar 2025 14:13:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1BDD03857C5F 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 1BDD03857C5F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702403; cv=none; b=leEVFlkTe3O2Sc+ywJC0uLWYQlqhDoPZm1J/d3HOhjNqafINexXSJKGg1iYrU0MvBqg8p+9g+jIyW/xSeKAcH/G6hqwPfgCJYCTEIje/kJJNpW6eS8NlXJNNDn94HGKwJE1O70B4q0QniSw1xYuN/BIgfgC2GXW3bWYYICtUjms= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702403; c=relaxed/simple; bh=bXEKoxRh9/wbKDXrebk5d2UgXQ+H3iRRm7dnCFd9Qow=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=K0SvlZX/q0d0X2A40UpksEN9RBbT5nOcOAdUPMz14i2vwi1poRrAoX68kWVF21dnA3+22YOazFwT0Jm9mJJ2YLZ2m93PpL/LT2jsq1RlFFVD/Ok7IesD2qXONOpyouvuMcqJhZayNfq8yRB+mR5fIXEMRXqqw0Ag9tcm9pzCUm0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5004a.ext.cloudfilter.net ([10.0.29.221]) by cmsmtp with ESMTPS id rvnAtyUKYiuzSs0LktjU1B; Tue, 11 Mar 2025 14:12:52 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id s0Ljttw2db7c4s0Ljtb1wZ; Tue, 11 Mar 2025 14:12:52 +0000 X-Authority-Analysis: v=2.4 cv=KvSG2nWN c=1 sm=1 tr=0 ts=67d044e4 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=CCpqsmhAAAAA:8 a=DB3L4cRBAtWgj855KRIA: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=rig5+OfY0tIVhPlicgeWlbx3Deoptx0pthT8kxqY3I8=; b=dxCYllh1KIuxz9Zf3AvnNwBIib 08oUNxW23YepC0DxR7A1DexLTToRxRI03YIr2EJjtXKULHAlwQYMbTlBayrzRcufuB8bZApyM/J/O OGe1W9aUojmIuDZEgDyF5CvUK; 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 1ts0Lj-000000003jP-0dTu; Tue, 11 Mar 2025 08:12:51 -0600 From: Tom Tromey Date: Tue, 11 Mar 2025 08:12:52 -0600 Subject: [PATCH 16/28] Convert ada-lang.c:map_matching_symbols MIME-Version: 1.0 Message-Id: <20250311-search-in-psyms-v1-16-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: 1ts0Lj-000000003jP-0dTu 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: 17 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfKuHnm3esRoS9XyUOKuSwOTpXp6dMjOEKuL4yM7HJggKBF+DEZ4icgRP049a02yNkYGaDG+TeT5P5ViMXrJRE6myd4StE6KC5A4bSc6Ftx6M0nnr6Hmi hzB8SXy8JVXxF5G8Ztvy+ME8imoAi2kGI3dTNNM90feEPzO4m0m40o6L7Pwf/o/7eKCuGe+6HvupgZnGIX9CyXYTqoYTzharb3Y= X-Spam-Status: No, score=-3016.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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 converts ada-lang.c:map_matching_symbols 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/ada-lang.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 3dc48125dee8aa424bc787a89323264d75837926..a8fc70688591d2f4bcd00a21fd164c386d4269d8 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5529,22 +5529,22 @@ map_matching_symbols (struct objfile *objfile, match_data &data) { data.objfile = objfile; - objfile->expand_symtabs_matching (nullptr, &lookup_name, - nullptr, nullptr, - global - ? SEARCH_GLOBAL_BLOCK - : SEARCH_STATIC_BLOCK, - domain); const int block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK; - for (compunit_symtab *symtab : objfile->compunits ()) + auto callback = [&] (compunit_symtab *symtab) { const struct block *block = symtab->blockvector ()->block (block_kind); - if (!iterate_over_symbols_terminated (block, lookup_name, - domain, data)) - break; - } + return iterate_over_symbols_terminated (block, lookup_name, + domain, data); + }; + + objfile->expand_symtabs_matching (nullptr, &lookup_name, + nullptr, callback, + global + ? SEARCH_GLOBAL_BLOCK + : SEARCH_STATIC_BLOCK, + domain); } /* Add to RESULT all non-local symbols whose name and domain match