From patchwork Tue Mar 11 14:12:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 107671 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 33F693857836 for ; Tue, 11 Mar 2025 14:15:41 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id B4B1F3857B9F for ; Tue, 11 Mar 2025 14:13:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B4B1F3857B9F 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 B4B1F3857B9F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702403; cv=none; b=icA0iZLG1PZ3vBc721WNvyI7f29YjO9TLSW+H0ReCOy/coVYRhoojJ6a8QnJyyxAwAvFVtZuibo7dz+w+4XNlhVeRPgVH15DlFcBNTgHDrXryDZ2oXgQlL9muUMGN6EBzFOmgupOujfff0RAEWyiK4W/oiCwzKZabtAhIU3ewkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702403; c=relaxed/simple; bh=MYUQW8Hr4l6VDNqcGZGalstlij+rMb87GcBS0/JJD2E=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=BVQaj5wVjNbZx1lun5z5LBgKjGNm6LCqUB2BYDXMuJhI9/89CuEeAlUPyQ3VZZoW3BsOPwMV/bjYZBqq9HIvWZsf9x/lcOaspd0Hw8TeKZ5qiSFOT+/vTT/3LR/KGcXF79NMLNPIuVc9YoJz05migVhgbLvsdM4ZFQRzWrBf51A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5007a.ext.cloudfilter.net ([10.0.29.141]) by cmsmtp with ESMTPS id rgvZtnxCkVkcRs0LltGVD4; Tue, 11 Mar 2025 14:12:53 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id s0LktOAUOoI0js0LltiWzT; Tue, 11 Mar 2025 14:12:53 +0000 X-Authority-Analysis: v=2.4 cv=TMBDSUla c=1 sm=1 tr=0 ts=67d044e5 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=CCpqsmhAAAAA:8 a=1q-tBgqM1SgN15iFquUA: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=7el8UEi2hvRn2gDpLyZVB9pvB8U7yhEYWNlyZqMhHo8=; b=Bxgr98XOtmjoaN+yvcBNnTgHqr IdglumZajHNoGQ2YFZ1D8CIArgRuBaKfvXemNm9hSLW4EVYv1Lz4zOYryRt8mdRsCrtm1dVqzy+2l eMB8AEYfFihxMv7XXlD8EGSxM; 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 1ts0Lk-000000003jP-0z5f; Tue, 11 Mar 2025 08:12:52 -0600 From: Tom Tromey Date: Tue, 11 Mar 2025 08:12:55 -0600 Subject: [PATCH 19/28] Remove objfile::expand_symtabs_for_function MIME-Version: 1.0 Message-Id: <20250311-search-in-psyms-v1-19-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: 1ts0Lk-000000003jP-0z5f 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: 20 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfPZExuTAvd+2HMMbETwwvGxG3WBgHYE1oylnfHGKwhLej6/2khGq59yofmRaOfKKGP0t3triNzrNxLIj4pGSRIIY4R2G2p31as7v0TIMrswL9QgauggW /y21GxXrPIYJrwVpzQ74iIRj6Y1KMsg1Y/P1E2jRwv+XHMp6+/mYFuubcP0mdvGWPzKkBaTuebZUq0Yg6S8bR/FHiwdaEKqvbeE= X-Spam-Status: No, score=-3016.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_LOTSOFHASH, 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 objfile::expand_symtabs_for_function only has a single caller now, so it can be removed. This also allows us to merge the expansion and searching phases, as done in other patches in this series. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16994 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16998 --- gdb/cp-support.c | 28 +++++++++++++++++----------- gdb/objfiles.h | 4 ---- gdb/symfile-debug.c | 22 ---------------------- 3 files changed, 17 insertions(+), 37 deletions(-) diff --git a/gdb/cp-support.c b/gdb/cp-support.c index 6dd364df1c4dc60a42c20482f195ee3f2350b5ca..22124d3f6091b53a7c1e100c4881027f716ce233 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -1455,17 +1455,15 @@ add_symbol_overload_list_qualified (const char *func_name, ? selected_block->objfile () : nullptr); + lookup_name_info base_lookup (func_name, symbol_name_match_type::FULL); + lookup_name_info lookup_name = base_lookup.make_ignore_params (); + gdbarch_iterate_over_objfiles_in_search_order (current_objfile ? current_objfile->arch () : current_inferior ()->arch (), - [func_name, surrounding_static_block, &overload_list] + [func_name, surrounding_static_block, &overload_list, lookup_name] (struct objfile *obj) { - /* Look through the partial symtabs for all symbols which - begin by matching FUNC_NAME. Make sure we read that - symbol table in. */ - obj->expand_symtabs_for_function (func_name); - - for (compunit_symtab *cust : obj->compunits ()) + auto callback = [&] (compunit_symtab *cust) { QUIT; const struct block *b = cust->blockvector ()->global_block (); @@ -1473,11 +1471,19 @@ add_symbol_overload_list_qualified (const char *func_name, b = cust->blockvector ()->static_block (); /* Don't do this block twice. */ - if (b == surrounding_static_block) - continue; + if (b != surrounding_static_block) + add_symbol_overload_list_block (func_name, b, overload_list); + return true; + }; - add_symbol_overload_list_block (func_name, b, overload_list); - } + /* Look through the partial symtabs for all symbols which + begin by matching FUNC_NAME. Make sure we read that + symbol table in. */ + obj->expand_symtabs_matching (nullptr, &lookup_name, + nullptr, callback, + (SEARCH_GLOBAL_BLOCK + | SEARCH_STATIC_BLOCK), + SEARCH_FUNCTION_DOMAIN); return 0; }, current_objfile); diff --git a/gdb/objfiles.h b/gdb/objfiles.h index 05e1e01d6352f6c0295e71fd611d6d6a19853673..6e119a5071f3b7846e060e9e433ea4729a286f14 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -577,10 +577,6 @@ struct objfile : intrusive_list_node /* See quick_symbol_functions. */ void dump (); - /* Find all the symbols in OBJFILE named FUNC_NAME, and ensure that - the corresponding symbol tables are loaded. */ - void expand_symtabs_for_function (const char *func_name); - /* See quick_symbol_functions. */ void expand_all_symtabs (); diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c index dda3efe9db35fa9bded93edf77ded7a0250a96b2..24304a05d7d978058659950b16190e24e04d0da7 100644 --- a/gdb/symfile-debug.c +++ b/gdb/symfile-debug.c @@ -310,28 +310,6 @@ objfile::dump () iter->dump (this); } -void -objfile::expand_symtabs_for_function (const char *func_name) -{ - if (debug_symfile) - gdb_printf (gdb_stdlog, - "qf->expand_symtabs_for_function (%s, \"%s\")\n", - objfile_debug_name (this), func_name); - - lookup_name_info base_lookup (func_name, symbol_name_match_type::FULL); - lookup_name_info lookup_name = base_lookup.make_ignore_params (); - - for (const auto &iter : qf) - iter->expand_symtabs_matching (this, - nullptr, - &lookup_name, - nullptr, - nullptr, - (SEARCH_GLOBAL_BLOCK - | SEARCH_STATIC_BLOCK), - SEARCH_FUNCTION_DOMAIN); -} - void objfile::expand_all_symtabs () {