From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id rcbdOkEu5mkOniwAWB0awg (envelope-from ) for ; Mon, 20 Apr 2026 09:46:41 -0400 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=Dx7g3jIg; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bba4lHzc; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Dx7g3jIg; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bba4lHzc; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id DC94D1E067; Mon, 20 Apr 2026 09:46:41 -0400 (EDT) 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 A49101E067 for ; Mon, 20 Apr 2026 09:46:40 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 2212A4D8D1F7 for ; Mon, 20 Apr 2026 13:46:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2212A4D8D1F7 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=Dx7g3jIg; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bba4lHzc; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Dx7g3jIg; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bba4lHzc Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 636074CD2029 for ; Mon, 20 Apr 2026 13:46:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 636074CD2029 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 636074CD2029 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776692775; cv=none; b=CY1/XsTI3c6Q5+oZ0fsQXJpjUewYvOyaPl9xFNm3zalUvjLLWnORa0JdAE21AwX1X1gN5mnVG65dOwXSkritn8URzlrb4Vi1AO7524/GPw21bidNYJs8mdZc1LWI7kUEJOeCUBD10ErXzfwl2bQ+kSKUobdtj0Ae3jQ88slRUw8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776692775; c=relaxed/simple; bh=mvF9VEpw159OR8mY+ydfHyFq34T6G1v3PR8ZqIS/p+M=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=jYHdR1H4stqYgqcc5PPTiqMVv0weU7s+3Ptm1lBvl0zgPjAtZmrm5prfrUVadIOyU2SlcWgiNYZo/ot2e0CPIkblINFkznWRIGI2hooi7NLDkQisW4eNFe8pqSOoHIy0FKdpJZEupRwBPJwkv0ZNi4mHk3HF3K+XYOnIa8FEPHY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 636074CD2029 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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-out1.suse.de (Postfix) with ESMTPS id 1D5986A7DA for ; Mon, 20 Apr 2026 13:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776692769; 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=XotCRBtB33yHM2pjbj2Mvk5Uxlpltv97fifK1rcNr3w=; b=Dx7g3jIgR9C8SM+ssH8T3lJqnmrdoCKDpQqwyW8kmnAhFZqXebfQzpaiUjynchLAKdxT4y LtFnSoJ206GHBWVRwG7NC0WItTR/vcqyhZTWrtDAFvMO2GIVivORy2jtVqQN8QHKOvAr7p 8kTaZYNKdGygSgfH7OMw8h+Az0rGpr4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776692769; 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=XotCRBtB33yHM2pjbj2Mvk5Uxlpltv97fifK1rcNr3w=; b=bba4lHzcm7BDkUcEylmbdhkqXIN6ZMYBlEhdrGPmDEkiRg80ZtTg+nXrM0wfph4P4dT+7s NjeQGMot82lL5YAg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Dx7g3jIg; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=bba4lHzc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776692769; 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=XotCRBtB33yHM2pjbj2Mvk5Uxlpltv97fifK1rcNr3w=; b=Dx7g3jIgR9C8SM+ssH8T3lJqnmrdoCKDpQqwyW8kmnAhFZqXebfQzpaiUjynchLAKdxT4y LtFnSoJ206GHBWVRwG7NC0WItTR/vcqyhZTWrtDAFvMO2GIVivORy2jtVqQN8QHKOvAr7p 8kTaZYNKdGygSgfH7OMw8h+Az0rGpr4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776692769; 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=XotCRBtB33yHM2pjbj2Mvk5Uxlpltv97fifK1rcNr3w=; b=bba4lHzcm7BDkUcEylmbdhkqXIN6ZMYBlEhdrGPmDEkiRg80ZtTg+nXrM0wfph4P4dT+7s NjeQGMot82lL5YAg== 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 05DF2593B0 for ; Mon, 20 Apr 2026 13:46:09 +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 mJ0uACEu5mnzQAAAD6G6ig (envelope-from ) for ; Mon, 20 Apr 2026 13:46:09 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/5] [gdb/symtab] Re-add lnp_state_machine::m_last_line Date: Mon, 20 Apr 2026 15:46:05 +0200 Message-ID: <20260420134608.2537059-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260420134608.2537059-1-tdevries@suse.de> References: <20260420134608.2537059-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: 1D5986A7DA 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 6020fe1fa55..c6e28c01d67 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