From patchwork Wed Mar 8 15:42:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 66135 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 BCB163850417 for ; Wed, 8 Mar 2023 15:43:18 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-820.bluehost.com (outbound-ss-820.bluehost.com [69.89.24.241]) by sourceware.org (Postfix) with ESMTPS id 0ED383858289 for ; Wed, 8 Mar 2023 15:42:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0ED383858289 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id 39D5510047F86 for ; Wed, 8 Mar 2023 15:42:48 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id ZvwGprOJQBwvKZvwGpx4v6; Wed, 08 Mar 2023 15:42:48 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Jqk0EO0C c=1 sm=1 tr=0 ts=6408acf8 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=k__wU0fu6RkA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=RDnGsalqh05TGaqV9CUA:9 a=QEXdDO2ut3YA:10:nop_charset_2 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=fZW5TiwANEZ6Ducuge4SzQf0GcAQoLbfpayciIrL2WI=; b=HNaPrH3O0XBVby3FcD9PQg+U+I 04P/BKHVkc48QheJbehifAOidMgm7g1yF5RBwj9qaEqM2dUE00Z0aoQLIcdXZHXl2Vewj0s4uFB1d 44eIpYaqQCeCPnQJlbV+zCagm; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:55612 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pZvwF-000Mk5-Vz for gdb-patches@sourceware.org; Wed, 08 Mar 2023 08:42:48 -0700 From: Tom Tromey Date: Wed, 08 Mar 2023 08:42:45 -0700 Subject: [PATCH 1/5] Add operator< and operator== to linetable_entry MIME-Version: 1.0 Message-Id: <20230308-submit-constify-linetable-v1-1-ca4057478141@tromey.com> References: <20230308-submit-constify-linetable-v1-0-ca4057478141@tromey.com> In-Reply-To: <20230308-submit-constify-linetable-v1-0-ca4057478141@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.1 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: 75.166.130.93 X-Source-L: No X-Exim-ID: 1pZvwF-000Mk5-Vz X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-130-93.hlrn.qwest.net ([192.168.0.21]) [75.166.130.93]:55612 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3026.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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.29 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 Sender: "Gdb-patches" This adds a couple of comparison operators to linetable_entry, and simplifies both the calls to sort and one other spot that checks for equality. --- gdb/buildsym.c | 14 +------------- gdb/disasm.c | 2 +- gdb/symtab.h | 13 +++++++++++++ gdb/xcoffread.c | 4 +--- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/gdb/buildsym.c b/gdb/buildsym.c index dbc81727cb1..6594da68131 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -892,17 +892,6 @@ buildsym_compunit::end_compunit_symtab_with_blockvector { if (!subfile->line_vector_entries.empty ()) { - const auto lte_is_less_than - = [] (const linetable_entry &ln1, - const linetable_entry &ln2) -> bool - { - if (ln1.pc == ln2.pc - && ((ln1.line == 0) != (ln2.line == 0))) - return ln1.line == 0; - - return (ln1.pc < ln2.pc); - }; - /* Like the pending blocks, the line table may be scrambled in reordered executables. Sort it if OBJF_REORDERED is true. It is important to preserve the order of lines at the same @@ -910,8 +899,7 @@ buildsym_compunit::end_compunit_symtab_with_blockvector relationships, this is why std::stable_sort is used. */ if (m_objfile->flags & OBJF_REORDERED) std::stable_sort (subfile->line_vector_entries.begin (), - subfile->line_vector_entries.end (), - lte_is_less_than); + subfile->line_vector_entries.end ()); } /* Allocate a symbol table if necessary. */ diff --git a/gdb/disasm.c b/gdb/disasm.c index a0406377acc..49053dcfbad 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -604,7 +604,7 @@ do_mixed_source_and_assembly_deprecated for (; i < nlines - 1 && le[i].pc < high; i++) { - if (le[i].line == le[i + 1].line && le[i].pc == le[i + 1].pc) + if (le[i] == le[i + 1]) continue; /* Ignore duplicates. */ /* Skip any end-of-function markers. */ diff --git a/gdb/symtab.h b/gdb/symtab.h index c565bc8eac4..69f0eaa0f88 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1547,6 +1547,19 @@ struct rust_vtable_symbol : public symbol struct linetable_entry { + bool operator< (const linetable_entry &other) const + { + if (pc == other.pc + && (line != 0) != (other.line != 0)) + return line == 0; + return pc < other.pc; + } + + /* Two entries are equal if they have the same line and PC. The + other members are ignored. */ + bool operator== (const linetable_entry &other) const + { return line == other.line && pc == other.pc; } + /* The line number for this entry. */ int line; diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index b74b235ee87..93054bdeb19 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -439,9 +439,7 @@ arrange_linetable (std::vector &old_linetable) if (fentries.empty ()) return; - std::sort (fentries.begin (), fentries.end (), - [] (const linetable_entry <e1, const linetable_entry& lte2) - { return lte1.pc < lte2.pc; }); + std::sort (fentries.begin (), fentries.end ()); /* Allocate a new line table. */ std::vector new_linetable;