From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WyrXJrvO7WcgkCQAWB0awg (envelope-from ) for ; Wed, 02 Apr 2025 19:56:43 -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=wNWr9MTA; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 92AF91E0C3; Wed, 2 Apr 2025 19:56:43 -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 338A81E0C0 for ; Wed, 2 Apr 2025 19:56:43 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E011E3857013 for ; Wed, 2 Apr 2025 23:56:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E011E3857013 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=wNWr9MTA Received: from omta034.useast.a.cloudfilter.net (omta034.useast.a.cloudfilter.net [44.202.169.33]) by sourceware.org (Postfix) with ESMTPS id 67E30385AC38 for ; Wed, 2 Apr 2025 23:45:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 67E30385AC38 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 67E30385AC38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1743637517; cv=none; b=Qm+THdiTgwk0LD8IZCOyoYzAa/cY+3JcwRrLAR0Oh3Vv/73QrPNihnmHiThvv4WgN6Qg0hCNZ0vc6FiwYXqOE4LwEiNuI/bv51ZTmnayFGFFAhnxS5Uz/wk+gFVtBnOtpm1+U8ML/khvEjkM+8saYFO9u7HCxcKDo9WJjrVO5Q8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1743637517; c=relaxed/simple; bh=pr5fj1Stiu/BPrG1UvdQUFHTGYOjq7K0Gr+qp/Mstb8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=mfM4VLuR2RgCPuduaREofJOcKHklwkPN3+IGknGxrbo7IsPxqGpfGcvuKmUmV7o99bZtM0TcrwCdryfv3s+QyjM6Mk9l+W3W4JBpQbEl8kSF7FeuOQ3nSuollc1xMOGGZQ1otxuKo41QsW1tyBtE7lnUrCcHWVIDsqn5mPeA+gI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 67E30385AC38 Received: from eig-obgw-6010a.ext.cloudfilter.net ([10.0.30.248]) by cmsmtp with ESMTPS id zzcytOFmjXshw07lluf4Cy; Wed, 02 Apr 2025 23:45:17 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 07lkufRyXqEhj07lku3Uov; Wed, 02 Apr 2025 23:45:17 +0000 X-Authority-Analysis: v=2.4 cv=SMVEVvvH c=1 sm=1 tr=0 ts=67edcc0d a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=ItBw4LHWJt0A:10 a=CCpqsmhAAAAA:8 a=HFojHLw0HuMREg_xHO0A: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=u6/uAa3d3a1/WY59clNDp0Ty0cPW5G9MgA3LS5s4098=; b=wNWr9MTAc2tDxr+lT7smA+CNSU hL+SNJRxsEwD5TrtybYKjVwpNHyf4xzhMxhsfU/l3nF3pen24W45IEzeVw+fM3FCaAWVf5QAjXwIh JOH59wpoyIkTD0q24S0eR7OW3; 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 1u07lk-000000014hd-12m3; Wed, 02 Apr 2025 17:45:16 -0600 From: Tom Tromey Date: Wed, 02 Apr 2025 17:45:12 -0600 Subject: [PATCH v2 13/28] Convert gdbpy_lookup_static_symbols MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250402-search-in-psyms-v2-13-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: 1u07lk-000000014hd-12m3 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: 14 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfM7YD9u+TkaKPzhynWmtFGMNtXtsPmMz4lTZ0Tno5YF4tN2eHaiIFs0zCqE7y5wJzWC151i/Z6Q/NH3+QHvmibOjtuaVMF84obp+OFxM9geI+vmFtJfe GnUijOkXxHK6HMVQ92IFCQajNzdC6id0yPYuvo+GCXAM7TPz/UVmeuK3vAWe4fi/saxN3HY1hsliPgJW4fBQ4is2urWfnEfyTWA= 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 changes gdbpy_lookup_static_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/python/py-symbol.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 3028a307205eb9ea70dd0c5f7fcbeda01d89b96d..5268b5a242c4cab801e342b2580fa8d99fdbbd1d 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -605,17 +605,17 @@ gdbpy_lookup_static_symbols (PyObject *self, PyObject *args, PyObject *kw) /* Expand any symtabs that contain potentially matching symbols. */ lookup_name_info lookup_name (name, symbol_name_match_type::FULL); - expand_symtabs_matching (NULL, lookup_name, NULL, NULL, - SEARCH_STATIC_BLOCK, flags); for (objfile *objfile : current_program_space->objfiles ()) { - for (compunit_symtab *cust : objfile->compunits ()) + bool error_found = false; + + auto callback = [&] (compunit_symtab *cust) { /* Skip included compunits to prevent including compunits from being searched twice. */ if (cust->user != nullptr) - continue; + return true; const struct blockvector *bv = cust->blockvector (); const struct block *block = bv->static_block (); @@ -628,13 +628,24 @@ gdbpy_lookup_static_symbols (PyObject *self, PyObject *args, PyObject *kw) if (symbol != nullptr) { PyObject *sym_obj = symbol_to_symbol_object (symbol); - if (sym_obj == nullptr) - return nullptr; - if (PyList_Append (return_list.get (), sym_obj) == -1) - return nullptr; + if (sym_obj == nullptr + || PyList_Append (return_list.get (), sym_obj) == -1) + { + error_found = true; + return false; + } } } - } + + return true; + }; + + objfile->expand_symtabs_matching + (nullptr, &lookup_name, nullptr, callback, + SEARCH_STATIC_BLOCK, flags); + + if (error_found) + return nullptr; } } catch (const gdb_exception &except) -- 2.46.1