Skip to content

remove unused fields from Dwarf_CU_Context_s #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oltolm wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −19
Open

remove unused fields from Dwarf_CU_Context_s #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/lib/libdwarf/dwarf_die_deliv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 0 additions & 3 deletions src/lib/libdwarf/dwarf_opaque.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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. */
Expand Down
11 changes: 2 additions & 9 deletions src/lib/libdwarf/dwarf_ranges.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions src/lib/libdwarf/dwarf_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down