From cd92794502c5d153c82f16d6b3a76e689f3a4e06 Mon Sep 17 00:00:00 2001
From: oltolm <oleg.tolmatcev@gmail.com>
Date: Thu, 9 Oct 2025 13:09:14 +0200
Subject: [PATCH] remove unused fields from Dwarf_CU_Context_s

---
 src/lib/libdwarf/dwarf_die_deliv.c |  5 +----
 src/lib/libdwarf/dwarf_opaque.h    |  3 ---
 src/lib/libdwarf/dwarf_ranges.c    | 11 ++---------
 src/lib/libdwarf/dwarf_util.c      |  3 ---
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/lib/libdwarf/dwarf_die_deliv.c b/src/lib/libdwarf/dwarf_die_deliv.c
index 2706526c..724e36b9 100644
--- a/src/lib/libdwarf/dwarf_die_deliv.c
+++ b/src/lib/libdwarf/dwarf_die_deliv.c
@@ -1503,10 +1503,7 @@ find_cu_die_base_fields(Dwarf_Debug dbg,
                     &at_ranges_offset,
                     &is_info,
                     error);
-                if (res == DW_DLV_OK) {
-                    cucon->cc_at_ranges_offset = at_ranges_offset;
-                    cucon->cc_at_ranges_offset_present = TRUE;
-                } else {
+                if (res != DW_DLV_OK) {
                     local_attrlist_dealloc(dbg,atcount,alist);
                     return res;
                 }
diff --git a/src/lib/libdwarf/dwarf_opaque.h b/src/lib/libdwarf/dwarf_opaque.h
index 90bcb407..911e9b05 100644
--- a/src/lib/libdwarf/dwarf_opaque.h
+++ b/src/lib/libdwarf/dwarf_opaque.h
@@ -285,7 +285,6 @@ struct Dwarf_CU_Context_s {
     /*  cc_cu_die_offset_present is non-zero if
         cc_cu_die_global_sec_offset is meaningful.  */
     Dwarf_Bool     cc_cu_die_offset_present;
-    Dwarf_Bool     cc_at_ranges_offset_present;
     /*  About: DW_AT_addr_base in CU DIE,
         offset to .debug_addr table */
     Dwarf_Bool     cc_addr_base_offset_present;
@@ -361,8 +360,6 @@ struct Dwarf_CU_Context_s {
     Dwarf_Bool     cc_macro_base_present;
     Dwarf_Bool     cc_macro_header_length_present;
 
-    /*  For quick access to .debug_ranges from a CU DIE. */
-    Dwarf_Unsigned cc_at_ranges_offset;
     /*  DW_SECT_RNGLISTS  */
     /*  DW_AT_GNU_ranges_base was a GNU extension that appeared
         but was unused. See dwarf_die_deliv.c for details. */
diff --git a/src/lib/libdwarf/dwarf_ranges.c b/src/lib/libdwarf/dwarf_ranges.c
index 56783cf0..68fd464b 100644
--- a/src/lib/libdwarf/dwarf_ranges.c
+++ b/src/lib/libdwarf/dwarf_ranges.c
@@ -444,8 +444,6 @@ dwarf_get_ranges_baseaddress(Dwarf_Debug dw_dbg,
     Dwarf_Error    *dw_error)
 {
     Dwarf_CU_Context context = 0;
-    Dwarf_Unsigned local_ranges_offset = 0;
-    Dwarf_Bool     local_ranges_offset_present = FALSE;
     Dwarf_Bool     have_die_ranges_offset = FALSE;
     Dwarf_Unsigned die_ranges_offset = 0;
     Dwarf_Bool     have_die_base_addr = FALSE;
@@ -484,16 +482,11 @@ dwarf_get_ranges_baseaddress(Dwarf_Debug dw_dbg,
             "dwarf_get_ranges_baseaddress");
         return DW_DLV_ERROR;
     }
-    if (have_die_ranges_offset) {
-        /*  From dw_die */
-        local_ranges_offset_present = have_die_ranges_offset;
-        local_ranges_offset = die_ranges_offset;
-    }
     if (dw_at_ranges_offset) {
-        *dw_at_ranges_offset = local_ranges_offset;
+        *dw_at_ranges_offset = die_ranges_offset;
     }
     if (dw_at_ranges_offset_present) {
-        *dw_at_ranges_offset_present = local_ranges_offset_present;
+        *dw_at_ranges_offset_present = have_die_ranges_offset;
     }
     if (context->cc_base_address_present) {
         *dw_baseaddress = context->cc_base_address;
diff --git a/src/lib/libdwarf/dwarf_util.c b/src/lib/libdwarf/dwarf_util.c
index b2b23d02..76c06abf 100644
--- a/src/lib/libdwarf/dwarf_util.c
+++ b/src/lib/libdwarf/dwarf_util.c
@@ -189,9 +189,6 @@ _dwarf_dump_optional_fields(const char *msg,
     /* useful? */
     printf("  cc_cu_die_offset_present...: %d \n",
         context->cc_cu_die_offset_present);
-    printf("  cc_at_ranges_offset_present: %d 0x%lx\n",
-        context->cc_at_ranges_offset_present,
-        (unsigned long)context->cc_at_ranges_offset);
     printf("  cc_addr_base_offset_present: %d 0x%lx\n",
         context->cc_addr_base_offset_present,
         (unsigned long)context->cc_addr_base_offset);