From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id UZbUEkPdvWgUlzAAWB0awg (envelope-from ) for ; Sun, 07 Sep 2025 15:30:11 -0400 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=DzjOC2lT; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 468DA1E0BA; Sun, 07 Sep 2025 15:30:11 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=no autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id C8C031E047 for ; Sun, 07 Sep 2025 15:30:10 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8A848385840E for ; Sun, 7 Sep 2025 19:30:10 +0000 (GMT) Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id 9BAC83858D3C for ; Sun, 7 Sep 2025 19:29:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9BAC83858D3C 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 9BAC83858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757273363; cv=none; b=Nq619fHABQyYv6GF8jiITcak/XOU8rznsEsS1SD6vcumlBZSg/IX+SnZb1aVmgaYgA5XTfhhOeQAB8CldgqMPYWD9BqH9K/pnzHOVxw2Gv0yXZ4+zztEUwRGrpe66wKp+pk1a7uRrYq3fqZundBt2/uTwtwJG2WwmMzGSr2b4vI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757273363; c=relaxed/simple; bh=PO+33MOwAN8OBiPc2mbU88vmwdY/NB+g2Jq2TzeVkOg=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=TQM3h+itWQ8Dhwe4W0qywShdpIRB7W+xbsybIKd0f7Bkk1KueOK0YTYOIDzTCZZwXn4C0LmZs/eUq7oZZ2GSbOjzVR5DBs7PR7nRY2wfKbRzeihXeExelGPVEK4zMhC8m8xtwN13BgPszLJP5nnw+HnBcFboOHi6ywMbMNTYazs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5006b.ext.cloudfilter.net ([10.0.29.217]) by cmsmtp with ESMTPS id uuOZuRgP3aPqLvL4fuIyTZ; Sun, 07 Sep 2025 19:29:17 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id vL4eu20kbcL7DvL4euLSvr; Sun, 07 Sep 2025 19:29:16 +0000 X-Authority-Analysis: v=2.4 cv=Xqb6OUF9 c=1 sm=1 tr=0 ts=68bddd0c a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=ItBw4LHWJt0A:10 a=uZbQGp3GzI8lxgk9v7kA:9 a=QEXdDO2ut3YA:10 a=VS4QxaUSPT0UtbFnIvSC: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=Z7aZHsN+d5OiQ1fmq7ZXdm+YW3DgM4UBrS8Pg/x0VoA=; b=DzjOC2lT84yh/mJPxeDddyX5t0 TImvdT3B95mZ7Ogbw9SUQS3dNtzjj1XEsYi071cQDG6YRPjbXehGrz4a7jPKo1UdcFQedEqZQhUkI VFRIpdosd55DH3TqInDxVvkDu; Received: from 97-122-110-68.hlrn.qwest.net ([97.122.110.68]:43620 helo=[192.168.0.17]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1uvL4e-00000003nLh-0V5Q; Sun, 07 Sep 2025 13:29:16 -0600 From: Tom Tromey Date: Sun, 07 Sep 2025 13:29:18 -0600 Subject: [PATCH 6/7] Change dwarf_finish_line to be a method MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250907-breakpoint-cu-expand-v1-6-dd2beef9d475@tromey.com> References: <20250907-breakpoint-cu-expand-v1-0-dd2beef9d475@tromey.com> In-Reply-To: <20250907-breakpoint-cu-expand-v1-0-dd2beef9d475@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.122.110.68 X-Source-L: No X-Exim-ID: 1uvL4e-00000003nLh-0V5Q X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-110-68.hlrn.qwest.net ([192.168.0.17]) [97.122.110.68]:43620 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: MS4xfMX4om2cG+7Q2UVRWLTPFyaOjtrl5Qxe7TJvrxZIkHUwSnaVKKfB6NiI88NAXUQV8GYfY59+kBE/FvdHasy//nuAcm/npIN92S607BOyiCvizZBHQwa3 pc01qqKxkh/uOeEHjq9qzlr/eqHiPc6MUVOvAfysWQthRl1Rzraj3wb91bh2aJcOehSKxI/O4ee9WRe8tevfeDfFpZNwJMNREdM= 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~public-inbox=simark.ca@sourceware.org This changes dwarf_finish_line to be a method of lnp_state_machine, simplifying it a bit. --- gdb/dwarf2/line-program.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gdb/dwarf2/line-program.c b/gdb/dwarf2/line-program.c index 732f6fa13357dfa66c2ba493b186cabbcb08285a..b6007e368344216af3e09d2651d9483b7d2940e6 100644 --- a/gdb/dwarf2/line-program.c +++ b/gdb/dwarf2/line-program.c @@ -151,6 +151,7 @@ class lnp_state_machine } bool record_line_p (); + void finish_line (); struct dwarf2_cu *m_cu; @@ -337,25 +338,24 @@ dwarf_record_line_1 (struct gdbarch *gdbarch, struct subfile *subfile, /* Subroutine of dwarf_decode_lines_1 to simplify it. Mark the end of a set of line number records. - The arguments are the same as for dwarf_record_line_1. If SUBFILE is NULL the request is ignored. */ -static void -dwarf_finish_line (struct gdbarch *gdbarch, struct subfile *subfile, - unrelocated_addr address, struct dwarf2_cu *cu) +void +lnp_state_machine::finish_line () { - if (subfile == NULL) + if (m_last_subfile == nullptr) return; if (dwarf_line_debug) { gdb_printf (gdb_stdlog, "Finishing current line, file %s, address %s\n", - lbasename (subfile->name.c_str ()), - paddress (gdbarch, (CORE_ADDR) address)); + lbasename (m_last_subfile->name.c_str ()), + paddress (m_gdbarch, (CORE_ADDR) m_address)); } - dwarf_record_line_1 (gdbarch, subfile, 0, address, LEF_IS_STMT, cu); + dwarf_record_line_1 (m_gdbarch, m_last_subfile, 0, m_address, LEF_IS_STMT, + m_currently_recording_lines ? m_cu : nullptr); } void @@ -409,10 +409,7 @@ lnp_state_machine::record_line (bool end_sequence) || (!end_sequence && m_line == 0)); if ((file_changed && !ignore_this_line) || end_sequence) - { - dwarf_finish_line (m_gdbarch, m_last_subfile, m_address, - m_currently_recording_lines ? m_cu : nullptr); - } + finish_line (); if (!end_sequence && !ignore_this_line) { -- 2.49.0