From patchwork Fri Jan 10 21:29:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 104546 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 9D1713857C58 for ; Fri, 10 Jan 2025 21:45:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D1713857C58 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=WNEgmtqL X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id A8F553857C5F for ; Fri, 10 Jan 2025 21:29:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A8F553857C5F 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 A8F553857C5F 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=1736544562; cv=none; b=MIyPEZsT4KogVPG5deJ7Vki0pyeTFMwZKy6NVTeOzxo8YaG4FunXLgz3cHzL2rI2zBtHAHbOY2efNBOsehP6Lpn+yGTxxWHP0exdUjxGHXFi1+C+JhHG1FJUsJoFbz98pMhonmBCn5iJAr1NHScVJUmjhGyZYHVAFgVth/7Fwp8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736544562; c=relaxed/simple; bh=O65bTXUlj0u12GDFMEFP29Hw7LVDte2mdpq6uBIcxQ0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=ctlxhlb5IqYBFatdcDk1+9kpLcGp7mJkX3coq8KY3aFl1AiXCcG+8TgXYjPSnR0hYKcDieYeshGPrwmcz5NCvKMdTg0naCOna6WQVJuhQSq20g+2NYnhXAi8Cf2jPq5uMTrzfEg80l32gEj0pd0OLsHLpIqjUxX/xK7MxY5LbBE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A8F553857C5F Received: from eig-obgw-6007a.ext.cloudfilter.net ([10.0.30.247]) by cmsmtp with ESMTPS id WKR4tbWhDxoE1WMZGtEiHS; Fri, 10 Jan 2025 21:29:22 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id WMZFtmv5NbUGLWMZFtfOon; Fri, 10 Jan 2025 21:29:21 +0000 X-Authority-Analysis: v=2.4 cv=Lv2UyGdc c=1 sm=1 tr=0 ts=67819131 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=VdSt8ZQiCzkA:10 a=ItBw4LHWJt0A:10 a=7d_E57ReAAAA:8 a=EuqcBZHCz_egLTRmhbYA:9 a=QEXdDO2ut3YA:10 a=jhqOcbufqs7Y1TYCrUUU: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=330Ss4GVZuRYfWmigHM0DK6s/rRgT3nhUMMUhMuHk5M=; b=WNEgmtqLcgrmofZRVpW47+FlVa +VP+Iu3HlsdhRsQAwBaBROpTIk3Zkq89DJh7K3QB5Y+i5CHKeyOZCWY5NCM7XWlD3iwjjs99Ty0P8 9i2bBGQ6PrkoxVyIk8BiEe7wc; Received: from 97-118-36-154.hlrn.qwest.net ([97.118.36.154]:40752 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1tWMZF-0042hb-0R; Fri, 10 Jan 2025 14:29:21 -0700 From: Tom Tromey Date: Fri, 10 Jan 2025 14:29:20 -0700 Subject: [PATCH v2 5/6] Hoist lambda in linespec.c:add_matching_symbols_to_info MIME-Version: 1.0 Message-Id: <20250110-linespec-state-cxx-v2-5-a17144fa5c36@tromey.com> References: <20250110-linespec-state-cxx-v2-0-a17144fa5c36@tromey.com> In-Reply-To: <20250110-linespec-state-cxx-v2-0-a17144fa5c36@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey , Simon Marchi 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.36.154 X-Source-L: No X-Exim-ID: 1tWMZF-0042hb-0R X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-36-154.hlrn.qwest.net (prentzel.local) [97.118.36.154]:40752 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfOGGTY1eiL22U3DJscHyOv+Cdeh7y3QB75t2CAZNffbzjqUgBwfsUPXPczjQ0qG2cywtNcWmn3d3cNL4h20HFsM09cCXTEtzPDByQ6Ude+ZpaTvFGZgs HjnWzI59qIj+FxpRzZck6AlJgdutF3AqFkVydtOlJoU8tw9gCWqEQtqFh3EAxDZGySVw8scdhxZhQsxeq1gIwBrRDMM3jlggHkM= X-Spam-Status: No, score=-3019.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 I noticed that two parts of linespec.c:add_matching_symbols_to_info use the same lambda, and hoisting this seems slightly more efficient. Approved-By: Simon Marchi --- gdb/linespec.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index db979431002cc2048f9fcab52da0066793ef17c5..eb27cb7e2d6706122ac7ae8ab7bab4ad8a44b8aa 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -4250,6 +4250,11 @@ add_matching_symbols_to_info (const char *name, { lookup_name_info lookup_name (name, name_match_type); + auto add_symbol = [&] (block_symbol *bsym) + { + return info->add_symbol (bsym); + }; + for (const auto &elt : *info->file_symtabs) { if (elt == nullptr) @@ -4257,8 +4262,7 @@ add_matching_symbols_to_info (const char *name, iterate_over_all_matching_symtabs (info->state, lookup_name, domain_search_flags, pspace, true, - [&] (block_symbol *bsym) - { return info->add_symbol (bsym); }); + add_symbol); search_minsyms_for_name (info, lookup_name, pspace, NULL); } else if (pspace == NULL || pspace == elt->compunit ()->objfile ()->pspace ()) @@ -4270,9 +4274,7 @@ add_matching_symbols_to_info (const char *name, program_space *elt_pspace = elt->compunit ()->objfile ()->pspace (); gdb_assert (!elt_pspace->executing_startup); set_current_program_space (elt_pspace); - iterate_over_file_blocks (elt, lookup_name, SEARCH_VFT, - [&] (block_symbol *bsym) - { return info->add_symbol (bsym); }); + iterate_over_file_blocks (elt, lookup_name, SEARCH_VFT, add_symbol); /* If no new symbols were found in this iteration and this symtab is in assembler, we might actually be looking for a label for