From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id odRLMGN5pWkQoRAAWB0awg (envelope-from ) for ; Mon, 02 Mar 2026 06:49:55 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Mf8wIAI9; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=vXxx5paD; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Mf8wIAI9; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=vXxx5paD; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id C144F1E089; Mon, 02 Mar 2026 06:49:55 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 30F721E089 for ; Mon, 02 Mar 2026 06:49:55 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 2AFD34BA23C7 for ; Mon, 2 Mar 2026 11:49:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2AFD34BA23C7 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Mf8wIAI9; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=vXxx5paD; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Mf8wIAI9; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=vXxx5paD Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 39F284BA23E8 for ; Mon, 2 Mar 2026 11:48:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 39F284BA23E8 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 39F284BA23E8 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772452138; cv=none; b=dVMpW2qdRAZZrZE9KOf9uaWLV2smmHOKsoPEMoodDuqT617weGGNBClVhPBix5krg9m1j5yCOUeiPVpQSSd6hIzZFyYLuu6NtXKKW7+NkPjUfsLmlVheiDC/BcoxU4QCFUe/AVoD+3UTpg4aTRAKg0KjpGS1B41sjyfHI+WeNOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772452138; c=relaxed/simple; bh=+Le+8NrGlHbixePWcXcGWDzxvtYMka0Eplmu7GbApjo=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=G2AJTTs87py5pcnEilczN+NMUUTv4o0vp1WI6u6LwDEnpGUrtegeGQPrvihO96bS6TUch8TWji0SmuRiEBR3c84Cw5Ko0Q+F653v/I7jIkvGMVCLTHTD9PNaWPSUE4CSj3kWvr+qjZYrhUy/sLBj4Z9Kl08UdpoP0KNm628VNdA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 39F284BA23E8 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6A74B5BD26 for ; Mon, 2 Mar 2026 11:48:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772452130; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Giz/o9R7W5QaLjQcAS7K07k6NMoKg/2PAgYsX/PizbA=; b=Mf8wIAI9nW68/GghHA3DUo8Bqa68qBz8LVoojA/P8g9GxJLrmMhgji6rVjTnlqV0H1VeBV RXZLC2yuXrJqKcTJ0nkARw7I1TgBQ5opE3H0DbcLl7VPjnuoDKExi2CHELh5mfQ7kcFWqF QyirZaWrZUhEk7U7V48kWcWL+tAufUQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772452130; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Giz/o9R7W5QaLjQcAS7K07k6NMoKg/2PAgYsX/PizbA=; b=vXxx5paDIeeGSgsJiCm/16bfC+uYgtZEPSD4321NN4XwuhxfxctUVnE8njmmraOnM1WS+e RwEeByl0QkYVWXCw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772452130; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Giz/o9R7W5QaLjQcAS7K07k6NMoKg/2PAgYsX/PizbA=; b=Mf8wIAI9nW68/GghHA3DUo8Bqa68qBz8LVoojA/P8g9GxJLrmMhgji6rVjTnlqV0H1VeBV RXZLC2yuXrJqKcTJ0nkARw7I1TgBQ5opE3H0DbcLl7VPjnuoDKExi2CHELh5mfQ7kcFWqF QyirZaWrZUhEk7U7V48kWcWL+tAufUQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772452130; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Giz/o9R7W5QaLjQcAS7K07k6NMoKg/2PAgYsX/PizbA=; b=vXxx5paDIeeGSgsJiCm/16bfC+uYgtZEPSD4321NN4XwuhxfxctUVnE8njmmraOnM1WS+e RwEeByl0QkYVWXCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 53D5E3EA6D for ; Mon, 2 Mar 2026 11:48:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id oFQ+EyJ5pWlEDQAAD6G6ig (envelope-from ) for ; Mon, 02 Mar 2026 11:48:50 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/3] [gdb/symtab] Re-add lnp_state_machine::m_last_line Date: Mon, 2 Mar 2026 12:48:48 +0100 Message-ID: <20260302114849.1797017-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260302114849.1797017-1-tdevries@suse.de> References: <20260302114849.1797017-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.991]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] 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 In class lnp_state_machine, we have member: ... /* The address of the last line entry. */ unrelocated_addr m_last_address; ... representing the address of the last line entry. Add a similar member for the line of the last line entry. --- gdb/dwarf2/line-program.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdb/dwarf2/line-program.c b/gdb/dwarf2/line-program.c index a28d589e251..b9d93bb7b0e 100644 --- a/gdb/dwarf2/line-program.c +++ b/gdb/dwarf2/line-program.c @@ -181,8 +181,9 @@ class lnp_state_machine /* The last file a line number was recorded for. */ struct subfile *m_last_subfile = NULL; - /* The address of the last line entry. */ + /* The address and line of the last line entry. */ unrelocated_addr m_last_address; + unsigned int m_last_line = 0; /* Set to true when a previous line at the same address (using m_last_address) had LEF_IS_STMT set in m_flags. This is reset to false @@ -508,6 +509,8 @@ lnp_state_machine::record_line (bool end_sequence) m_last_address = m_address; } m_stmt_at_address |= (m_flags & LEF_IS_STMT) != 0; + + m_last_line = m_line; } lnp_state_machine::lnp_state_machine (struct dwarf2_cu *cu, gdbarch *arch) -- 2.51.0