From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id YR+5DWMu5mkOniwAWB0awg (envelope-from ) for ; Mon, 20 Apr 2026 09:47:15 -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=befajPep; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=h5yHe1rK; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=t7Ujn85J; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=WwAQoYaU; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 33D5E1E0CA; Mon, 20 Apr 2026 09:47:15 -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 A9F101E067 for ; Mon, 20 Apr 2026 09:47:14 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 47C3A4D108DB for ; Mon, 20 Apr 2026 13:47:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 47C3A4D108DB 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=befajPep; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=h5yHe1rK; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=t7Ujn85J; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=WwAQoYaU Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 053DF4BA23C2 for ; Mon, 20 Apr 2026 13:46:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 053DF4BA23C2 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 053DF4BA23C2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776692770; cv=none; b=Fm5AA+SRYLdXk6SmGXxXPo8KlXyNIsPqoaSjYxNki9AVKj9yAY1xrVyV22cfm6tqTOeTqFcA62xrw6oACWkZrAQsLxgKGYBi7f5tbap93dKjf6s73BohwDlUmvm1yP5Ya4OMxzVoeAipUjvwuNrZZEaSWVz8jMHKQh+0ELWtYtc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776692770; c=relaxed/simple; bh=UuXfvhPcwm+sK7g0rgpTbU666iumig3puXmNZdR/xow=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=gsBEhLAKYbPpK4Zne6vdMY0P05zbY9rE5D7qU9lpXb79hwMl13I5jOAzfm2e+HZuYIIJD1dHXaUzm3CUUbBUZQwHX7dt6ecZGkvSCCVIZ9bBJS70t3+adl1r/Sa9DxSVXWMkbh6La7oMvrWQoHGw/VylAgR8bk9QRjm18wDs+rs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 053DF4BA23C2 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 F31AA5BCDF for ; Mon, 20 Apr 2026 13:46:08 +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=NbnfYHay+Yc88skY4pKtdJhCWx93Aw3NGl0x1rtCSuw=; b=befajPepJ2PWwvVArvNyEzCnrqqSQgGYFogIAsRfBtvmD+VFFrgM3npWexe9bsQ80XSKP/ IFfOMA+JuKvIBinBlnw+qaPXIE1FWjubvhplD2C88b2IBQbz9I0+9JfBD4VMlpU+j7g5vy ZK1zKzCmU0cmW3HgeRRGfKmnN1QwiMw= 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=NbnfYHay+Yc88skY4pKtdJhCWx93Aw3NGl0x1rtCSuw=; b=h5yHe1rKdpJQt4+tGU8EfUw73ZyEBJiTemPrF0bCiHWBFPhtWm2L/4j+5dL0Giu+H/sb3K BLpPuARanBQe61DA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776692768; 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=NbnfYHay+Yc88skY4pKtdJhCWx93Aw3NGl0x1rtCSuw=; b=t7Ujn85Jc3PSxWgNm88GMQkjwuAnMVmQ0eODYUE43rAhlZyz4jD9Tl+YRnIEX16uhph0Px XrSmB44Oal78FSX23s6JxVtiCbXZ+GTu6Aoyp3wleOQw+PD0QYcx+wmLrpglQleMNnz8MK 9+pUyyNvh+4iJ+Xyh0DF7BlmTIZnvHI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776692768; 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=NbnfYHay+Yc88skY4pKtdJhCWx93Aw3NGl0x1rtCSuw=; b=WwAQoYaU7edzZQZlaNGfmEuy4hTRhW+lAAU3VAgtnzXpw3XgYfoFRaMUhCDf9iSwtEFmhG 2mG87NxfnWqxkOCQ== 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 DFDEE593AF for ; Mon, 20 Apr 2026 13:46:08 +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 OGZeNSAu5mnzQAAAD6G6ig (envelope-from ) for ; Mon, 20 Apr 2026 13:46:08 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 1/5] [gdb/symtab] Rename lnp_state_machine::m_last_line to m_last_recorded_line Date: Mon, 20 Apr 2026 15:46:04 +0200 Message-ID: <20260420134608.2537059-2-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-Spamd-Result: default: False [-2.80 / 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)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid] 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 m_last_line: ... /* The last line number that was recorded, used to coalesce consecutive entries for the same line. This can happen, for example, when discriminators are present. PR 17276. */ unsigned int m_last_line = 0; ... representing the last recorded line. Let's make this situation more clear, and rename it to m_last_recorded_line. --- gdb/dwarf2/line-program.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/dwarf2/line-program.c b/gdb/dwarf2/line-program.c index b9da1b4799f..6020fe1fa55 100644 --- a/gdb/dwarf2/line-program.c +++ b/gdb/dwarf2/line-program.c @@ -196,7 +196,7 @@ class lnp_state_machine /* The last line number that was recorded, used to coalesce consecutive entries for the same line. This can happen, for example, when discriminators are present. PR 17276. */ - unsigned int m_last_line = 0; + unsigned int m_last_recorded_line = 0; bool m_line_has_non_zero_discriminator = false; }; @@ -301,7 +301,7 @@ lnp_state_machine::record_line_p () { if (m_builder->get_current_subfile () != m_last_subfile) return true; - if (m_line != m_last_line) + if (m_line != m_last_recorded_line) return true; /* Same line for the same file that we've seen already. As a last check, for pr 17276, only record the line if the line @@ -495,7 +495,7 @@ lnp_state_machine::record_line (bool end_sequence) { m_last_subfile = m_builder->get_current_subfile (); record_line_1 (m_line, lte_flags); - m_last_line = m_line; + m_last_recorded_line = m_line; } } } -- 2.51.0