From patchwork Tue Mar 11 14:12:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 107674 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 D8DAE3857BA5 for ; Tue, 11 Mar 2025 14:16:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8DAE3857BA5 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=u/iDGHqB X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta034.useast.a.cloudfilter.net (omta034.useast.a.cloudfilter.net [44.202.169.33]) by sourceware.org (Postfix) with ESMTPS id DF9FB3858410 for ; Tue, 11 Mar 2025 14:12:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DF9FB3858410 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 DF9FB3858410 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=1741702372; cv=none; b=v0n2A+aOUFEFPjTdsCXtNEfk5wV+jFi3A8DJucq7OtquZRYPIu5vqD+cTXk44Rb2fz2YYMo1oHPM3+8ien3T3sIujt5yN+B6QNwJ37e+B/tprQdNEUGK0JVFQe8kY8ZHu8UyGAca4eMF04zvtK2lvjbjS3sDOC4hCxiJJlJ/qC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702372; c=relaxed/simple; bh=flYlNVM7JwAFmOb23K7BJWn7IfRunMAvOqpVl82Na7I=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=VbP4y9Bjz7oVibL50esSFGNS5eNF+0rbp1W+CWec270Vfe8O2zfoDK+YdLtyHSJWKXKY21x6BhQmjKK9gxVuN6v1qzmHRTdO599Za9CvikPIhJQH1sqCkkHBjvd10aadSSXNMal2aQy76XPprRNMlsXTI5QNMRpiubL7G3bXNm0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DF9FB3858410 Received: from eig-obgw-5008a.ext.cloudfilter.net ([10.0.29.246]) by cmsmtp with ESMTPS id rvURtSXqhXshws0LjtbLj6; Tue, 11 Mar 2025 14:12:51 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id s0LitaHH2khljs0Lit2zdQ; Tue, 11 Mar 2025 14:12:51 +0000 X-Authority-Analysis: v=2.4 cv=F79RdLhN c=1 sm=1 tr=0 ts=67d044e3 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA: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=tiQI6nU4tIq5D0bPlorZT8tQ+VJRoTeXJWhRSRusfgY=; b=u/iDGHqBYzaebrr2T2TfEC0Q7Z cJD1CKpet11l+KM93K0oFcqYMZY4JQ8HB7qH0krgdegou+uk1rW9Lt8sr2WForoWpgcH135tvagJS C5QUA6c1n5FQ+cHj3KCW3e1yo; 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 1ts0Li-000000003jP-0LOK; Tue, 11 Mar 2025 08:12:50 -0600 From: Tom Tromey Date: Tue, 11 Mar 2025 08:12:49 -0600 Subject: [PATCH 13/28] Convert gdbpy_lookup_static_symbols MIME-Version: 1.0 Message-Id: <20250311-search-in-psyms-v1-13-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: 1ts0Li-000000003jP-0LOK 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: 14 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfAezzxtYOnf7fQzeIi3yhI8Zz3oWy6kQBCqwAhsID8MBpg54nG3zWyyALUxpqhf8cTW6EBFWnEVy7QnvjnuALv2rCoF/fODTI+RoEyzf3pJmMNAbdR0k xWqMNB30rYURF3KDOZD7W3ktB1Jko1uSIW3Ot5k6cYXTupcBfUE8GAqsQi22TQ9pExogPTjEGmS6tT0DZfXOBzh2obdjSzS7tf8= X-Spam-Status: No, score=-3016.8 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 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 3ce104984b4443f543678e2672fdf250b14fa070..5068766faccc39ee6fc40eb40f66708c4390dbd3 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -622,17 +622,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 (); @@ -645,13 +645,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)