From patchwork Tue Mar 11 14:13:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 107682 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 CE422385780C for ; Tue, 11 Mar 2025 14:19:21 +0000 (GMT) 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 B25FB3858435 for ; Tue, 11 Mar 2025 14:13:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B25FB3858435 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 B25FB3858435 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=1741702406; cv=none; b=rKW3hwl/wXDPV6Gl2Otzwb4qGShWO1EAi03cDAlxcNx9nXRlFsONCuJghzf0KleAD74WJXUo1dyLfcjDv9uohuhmR5Rr+h/N8e00JVh4MT6VEeeQte064/hHg3AYFNKZnFmJztEaVJFJRcjMfrAoBdqAejefROmgJHNLIxSiLz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702406; c=relaxed/simple; bh=kqCSi3MYKdHX2v0Q/HPW9eUvKfiTjFejkhobHnQhqsI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=mkn4r+P7ER/4G9AGTzeNjZbbkBe69nykk52OuufQ+s+JHzIGqRmaxGSnjkV31Ep64QQrddklLJCu5uCg4N1qQt1NQ/j/+MwuamLviqoXTbcotPIQ7gvUKoTL03aEhadFU4zcYfVTuk6+9QvJgwkRw6enV4fwhOSKE0qRNjVb9PU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5006a.ext.cloudfilter.net ([10.0.29.179]) by cmsmtp with ESMTPS id rx4otrX4DzZPas0LotGGRs; Tue, 11 Mar 2025 14:12:56 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id s0LntEQFadTeZs0LntsaYf; Tue, 11 Mar 2025 14:12:55 +0000 X-Authority-Analysis: v=2.4 cv=XZCPzp55 c=1 sm=1 tr=0 ts=67d044e7 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=CCpqsmhAAAAA:8 a=W36wWPHqKxj3RbQ4xqwA: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=jkkmFL7nihO8cO9QQl8ZsJWfKE1HxDmhqcpnQHzKOY4=; b=SVpkt9k6EKSQ/FLLvPqhnA7J0e lSGfYtyea4lIigCy5ctvdf4o6cZoEFIQZ29snkFg2BKi6DOZXM5xdbYzyuU0GiXXaDDvPV9YywU83 /wnA9KoQGqVUs9ITOu5nnTkLW; 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 1ts0Lm-000000003jP-3R3T; Tue, 11 Mar 2025 08:12:54 -0600 From: Tom Tromey Date: Tue, 11 Mar 2025 08:13:02 -0600 Subject: [PATCH 26/28] Convert lookup_symbol_in_objfile MIME-Version: 1.0 Message-Id: <20250311-search-in-psyms-v1-26-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: 1ts0Lm-000000003jP-3R3T 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: 27 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfHaOmNZkIsN/udJt5eMBZWI5bPydM7VinTGHwyNTg19lYHw9zpTJUUUOb6Q1kPUM/FycPUR4ULEbN6kbsLuYwFY10QEP+yjBX6j8dc8bHGWp+gGmE+KY O88tj0DKtVXQUqAAHdUl433cJspbIW43uRjup1iTvVyojGQ7cSIElJ9rbQ6ZIdpZirf+rCHnP7k0VGH54WRNXZJ2fit6asIfEeM= X-Spam-Status: No, score=-3016.2 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_HOSTKARMA_BL, 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 lookup_symbol_in_objfile to the callback approach by removing the call to lookup_symbol_in_objfile_symtabs. (The latter is not removed as there are still other callers.) Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16994 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16998 --- gdb/symtab.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index dee25051c85db6444687ead8524281bb482c03eb..c325432f7af0f1f6811916406e7c8b902c5852ee 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2595,24 +2595,12 @@ lookup_symbol_in_objfile (struct objfile *objfile, enum block_enum block_index, ? "GLOBAL_BLOCK" : "STATIC_BLOCK", name, domain_name (domain).c_str ()); - result = lookup_symbol_in_objfile_symtabs (objfile, block_index, - name, domain); - if (result.symbol != NULL) - { - symbol_lookup_debug_printf - ("lookup_symbol_in_objfile (...) = %s (in symtabs)", - host_address_to_string (result.symbol)); - return result; - } - result = lookup_symbol_via_quick_fns (objfile, block_index, name, domain); - symbol_lookup_debug_printf ("lookup_symbol_in_objfile (...) = %s%s", + symbol_lookup_debug_printf ("lookup_symbol_in_objfile (...) = %s", result.symbol != NULL ? host_address_to_string (result.symbol) - : "NULL", - result.symbol != NULL ? " (via quick fns)" - : ""); + : "NULL"); return result; }