From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Aa/kJc9gDmm6TSoAWB0awg (envelope-from ) for ; Fri, 07 Nov 2025 16:12:47 -0500 Received: by simark.ca (Postfix, from userid 112) id 981861E0BC; Fri, 07 Nov 2025 16:12:47 -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.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, 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 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 C1A1F1E04C for ; Fri, 07 Nov 2025 16:12:46 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4971A3858D1E for ; Fri, 7 Nov 2025 21:12:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4971A3858D1E Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 18D7F3858CD1 for ; Fri, 7 Nov 2025 21:10:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 18D7F3858CD1 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 18D7F3858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762549846; cv=none; b=CN+vOmmI3jk9DMVlRQxttBEmcH9sHMFRXDL6SeMrIpuYQ6MOARP+MdHnQnDmE2G/L6x1/E+EOTK7gfj40L2Rk1HfDymtdkcL/6iBo5iwaz+NzbxNJFx1kNHLhjK9mIC5NIR1FJ9NfO0AoIo4Nj9N5SOZHCNspqunKBvj+KRqrwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762549846; c=relaxed/simple; bh=mScSJW0t/rRd/YkzZn+6vlNwTYTu+uAe2Nljlyx27Aw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=JgpypEpSmMqu7E/9a7HQf4MeYbC47AURpX7jIQ8QvJz4yX8u9IZCkqQSsY9PQNKHX3HT89MpEuZlnsyxEEU/vVmUOSHjWsMWUrRrV2KyuV75zxnAAmrjrFOMqQZITP+evOBz/wjTeBQ4xtcExQh9sRjsDNneY7XZjtqRiXa/VlA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 18D7F3858CD1 Received: by simark.ca (Postfix) id 437FB1E11B; Fri, 07 Nov 2025 16:10:43 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 6/6] gdb/dwarf: use dwarf2_per_cu::ref_addr_size in one spot Date: Fri, 7 Nov 2025 16:10:17 -0500 Message-ID: <20251107211041.520697-7-simon.marchi@efficios.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251107211041.520697-1-simon.marchi@efficios.com> References: <20251107211041.520697-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Simon Marchi I noticed this spot that could use dwarf2_per_cu::ref_addr_size, instead of implementing the same logic. Change-Id: I894ef1dcaa687c659e49bc1eb433e42818038cf2 --- gdb/dwarf2/read.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index a8b9798c4e8e..c355cc2bb5cb 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -3866,12 +3866,7 @@ cutu_reader::skip_one_attribute (dwarf_form form, const gdb_byte *info_ptr) switch (form) { case DW_FORM_ref_addr: - /* In DWARF 2, DW_FORM_ref_addr is address sized; in DWARF 3 - and later it is offset sized. */ - if (m_cu->header.version == 2) - return info_ptr + m_cu->header.addr_size; - else - return info_ptr + m_cu->header.offset_size; + return info_ptr + m_cu->per_cu->ref_addr_size (); case DW_FORM_GNU_ref_alt: return info_ptr + m_cu->header.offset_size; -- 2.51.2