From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Fri, 21 Nov 2025 20:14:04 +0000 (-0500)
Subject: gdb/dwarf: use dwarf2_per_cu::ref_addr_size in one spot
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad60ac4b53e46e02eafa90706d66c2d57667fcd6;p=thirdparty%2Fbinutils-gdb.git

gdb/dwarf: use dwarf2_per_cu::ref_addr_size in one spot

I noticed this spot that could use dwarf2_per_cu::ref_addr_size, instead
of implementing the same logic.

Change-Id: I894ef1dcaa687c659e49bc1eb433e42818038cf2
Approved-By: Andrew Burgess <aburgess@redhat.com>
---

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 49cbcdd96f4..d9cc5b9f98f 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -3890,12 +3890,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;