From patchwork Wed Mar 8 15:42:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 66134 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 B0D743850228 for ; Wed, 8 Mar 2023 15:43:03 +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 99C9C385B53B for ; Wed, 8 Mar 2023 15:42:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 99C9C385B53B 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 cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id DF28010047F88 for ; Wed, 8 Mar 2023 15:42:48 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id ZvwGp9CurevcbZvwGpZylR; Wed, 08 Mar 2023 15:42:48 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=afmkITkt 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=RP4jexKinJA9LFmTAKIA: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=YCeQ9eTKa3pQIRfrrEJKFXnabFcenezbud5GzmqgQY0=; b=ReLOQRn8qWqh9ZNkzW9FiY/oYc S31mKYga9EwbtlO6SPqgdxZR9eWi9FPbslZthdW7fG5rl65sYg2qjFGEsCUP1fjj36yfGCZ/HW0PO X+jXDQssE/hj8X7X6Wxp+AOQW; 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 1pZvwG-000Mk5-Gd for gdb-patches@sourceware.org; Wed, 08 Mar 2023 08:42:48 -0700 From: Tom Tromey Date: Wed, 08 Mar 2023 08:42:49 -0700 Subject: [PATCH 5/5] Change linetable_entry::is_stmt to bool MIME-Version: 1.0 Message-Id: <20230308-submit-constify-linetable-v1-5-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: 1pZvwG-000Mk5-Gd 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: 6 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 changes linetable_entry::is_stmt to type bool, rather than unsigned. --- gdb/jit.c | 2 +- gdb/record-btrace.c | 2 +- gdb/symtab.h | 2 +- gdb/xcoffread.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/jit.c b/gdb/jit.c index b27df8a6e17..22ce7542c98 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -493,7 +493,7 @@ jit_symtab_line_mapping_add_impl (struct gdb_symbol_callbacks *cb, { stab->linetable->item[i].set_pc ((CORE_ADDR) map[i].pc); stab->linetable->item[i].line = map[i].line; - stab->linetable->item[i].is_stmt = 1; + stab->linetable->item[i].is_stmt = true; } } diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 5b6e33f78fe..3e71c6c9a10 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -738,7 +738,7 @@ btrace_find_line_range (CORE_ADDR pc) change was made I was unsure how to test this so chose to go with maintaining the existing experience. */ if ((lines[i].raw_pc () == pc) && (lines[i].line != 0) - && (lines[i].is_stmt == 1)) + && lines[i].is_stmt) range = btrace_line_range_add (range, lines[i].line); } diff --git a/gdb/symtab.h b/gdb/symtab.h index 654da14e9a8..5c1b0611f9a 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1575,7 +1575,7 @@ struct linetable_entry int line; /* True if this PC is a good location to place a breakpoint for LINE. */ - unsigned is_stmt : 1; + bool is_stmt : 1; /* True if this location is a good location to place a breakpoint after a function prologue. */ diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 45578311705..9a7606015e2 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -422,7 +422,7 @@ arrange_linetable (std::vector &old_linetable) for (int ii = 0; ii < old_linetable.size (); ++ii) { - if (old_linetable[ii].is_stmt == 0) + if (!old_linetable[ii].is_stmt) continue; if (old_linetable[ii].line == 0) @@ -431,7 +431,7 @@ arrange_linetable (std::vector &old_linetable) fentries.emplace_back (); linetable_entry &e = fentries.back (); e.line = ii; - e.is_stmt = 1; + e.is_stmt = true; e.set_pc (old_linetable[ii].raw_pc ()); } }