From patchwork Sun Feb 18 01:10:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 85930 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 7F4CD3861002 for ; Sun, 18 Feb 2024 01:14:05 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id 971B2386000B for ; Sun, 18 Feb 2024 01:10:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 971B2386000B 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 971B2386000B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708218615; cv=none; b=qdI2M5gYIVUGYhUQd3XPGbvavFbumCxtb5Vpmzr5F1OtFVf+RvXeBf2J2rER5Qx1+3c4ITSZof9Aoo6684mh3rzbM3PYcIcnOnkKCvzu4juKHIJjwZE/QYs1+4sOfU+IN5e9u3lycYhfTgNQA7iKD/FYS/LK39Q+tJP3ARA1J3s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708218615; c=relaxed/simple; bh=bWYp0lO97u45+KOjL9P0tmPMorbx07OLiO0lc5wfoK8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=PylRNjFPEPNMkXplhDGFgLWGxOZ7Tmy4mF9fG0FaW4cpS+QROsVKkMMUpwA6ofNBdgyQb7WeQfpH4AkxS+evI0aVrJ5WTC3CHMHhv19U9yLOt2uS5VNnw6SxxbFHVk/ajBaTe1kj1eX7McZf36frCpo6tJRqCKMdD+yFpW95uxs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6009a.ext.cloudfilter.net ([10.0.30.184]) by cmsmtp with ESMTPS id bOyorcNwhpUFLbVh0rm9cY; Sun, 18 Feb 2024 01:10:06 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id bVgzrUHxv511rbVh0r86rq; Sun, 18 Feb 2024 01:10:06 +0000 X-Authority-Analysis: v=2.4 cv=X5vxK3Te c=1 sm=1 tr=0 ts=65d158ee a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=k7vzHIieQBIA:10 a=Qbun_eYptAEA:10 a=1KOCFADMNJUfl-ylR9wA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=9Dz7DOCrR9nkfWSyzXm1kj3A26uVZq98MOBpVJ11EEc=; b=daE+MeHzmKRa5956nu21R5990E 1023kWCp3s8EBxG65UtxG7o3c13VPbUzfcCTZcEfjuu6ZQx9qPuAx3fjhNTwYNHosARs0fP47lykE V6L85c7X1VgLFYLoXEx6/2SVs; Received: from 71-211-170-195.hlrn.qwest.net ([71.211.170.195]:49770 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rbVgz-003IPy-1h for gdb-patches@sourceware.org; Sat, 17 Feb 2024 18:10:05 -0700 From: Tom Tromey Date: Sat, 17 Feb 2024 18:10:07 -0700 Subject: [PATCH 6/7] Use bound_minimal_symbol more in lookup_minimal_symbol_by_pc_section MIME-Version: 1.0 Message-Id: <20240217-dwarf-race-relocate-v1-6-d3d2d908c1e8@tromey.com> References: <20240217-dwarf-race-relocate-v1-0-d3d2d908c1e8@tromey.com> In-Reply-To: <20240217-dwarf-race-relocate-v1-0-d3d2d908c1e8@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 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: 71.211.170.195 X-Source-L: No X-Exim-ID: 1rbVgz-003IPy-1h X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-170-195.hlrn.qwest.net ([192.168.0.21]) [71.211.170.195]:49770 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfJPRPR1L1PaGxvJrhAid3khsucv6d5CeAQt1Sa8iRg+sGo7Tkzyq9azoJ7SPLB/bw2rM3A5EwoWukkPGN1u/RrtnzB0/3XOKzpVLCw998eS90pxYkl9W mM//nLlgITb/I/BGXH7hAgm+pS2wsvZ73CtGpJMCBmO1oN4T5TfdeOC5ZIMfnJhs2H4+HMGtBBKQWUJI6trc2QLRbUEafetMkBw= X-Spam-Status: No, score=-3021.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_VALIDITY_RPBL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 lookup_minimal_symbol_by_pc_section tracks the best symbol and objfile. This patch changes it to use a bound_minimal_symbol rather than two separate variables. This simplifies the code a little. --- gdb/minsyms.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/gdb/minsyms.c b/gdb/minsyms.c index 2c8bf2a9f0b..64f085a0314 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -968,9 +968,7 @@ lookup_minimal_symbol_by_pc_section (CORE_ADDR pc_in, struct obj_section *sectio lookup_msym_prefer prefer, bound_minimal_symbol *previous) { - struct minimal_symbol *best_symbol = NULL; - struct objfile *best_objfile = NULL; - struct bound_minimal_symbol result; + struct bound_minimal_symbol best = {}; if (previous != nullptr) { @@ -1036,18 +1034,13 @@ lookup_minimal_symbol_by_pc_section (CORE_ADDR pc_in, struct obj_section *sectio /* MINSYM now is the best one in this objfile's minimal symbol table. See if it is the best one overall. */ if (minsym != nullptr - && ((best_symbol == NULL) || - (best_symbol->unrelocated_address () - < minsym->unrelocated_address ()))) - { - best_symbol = minsym; - best_objfile = objfile; - } + && (best.minsym == nullptr + || (best.minsym->unrelocated_address () + < minsym->unrelocated_address ()))) + best = { minsym, objfile }; } - result.minsym = best_symbol; - result.objfile = best_objfile; - return result; + return best; } /* See minsyms.h. */