Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-15 20:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

dwarf2dbg.c line_entry.next assert

Browse Source 
I was puzzling over how it was correct to cast what is clearly a
struct line_entry** pointer to a struct line_entry* pointer for a
few moments, and was going to write a comment but then decided we
really don't require the "next" pointer to be where it is.  Replace
the assert with an inline function that does any necessary pointer
adjustments.

	* dwarf2dbg.c (line_entry.next): Delete static assertion.
	(line_entry_at_tail): New inline function.
	(dwarf2_gen_line_info_1, dwarf2_finish): Replace casts in
	set_or_check_view arguments with line_entry_at_tail.
This commit is contained in:
Alan Modra
2025-06-09 12:51:01 +09:30
parent 7e34612049
commit 02aa7e267b
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gas/dwarf2dbg.c
View File

@@ -171,10 +171,18 @@ struct line_entry
struct dwarf2_line_info loc; struct dwarf2_line_info loc;
}; };
/* Don't change the offset of next in line_entry. set_or_check_view /* Given line_entry list HEAD and PTAIL pointers, return a pointer to
calls in dwarf2_gen_line_info_1 depend on it. */ the last line_entry on the list. */
static char unused[offsetof(struct line_entry, next) ? -1 : 1] static inline struct line_entry *
ATTRIBUTE_UNUSED; line_entry_at_tail (void *head, struct line_entry **ptail)
{
/* If the list is empty ptail points at head. */
if (head == NULL)
return NULL;
/* Otherwise ptail points to line_entry.next of the last entry. */
void *p = (char *) ptail - offsetof (struct line_entry, next);
return p;
}
struct line_subseg struct line_subseg
{ {
@@ -528,7 +536,8 @@ dwarf2_gen_line_info_1 (symbolS *label, struct dwarf2_line_info *loc)
/* Subseg heads are chained to previous subsegs in /* Subseg heads are chained to previous subsegs in
dwarf2_finish. */ dwarf2_finish. */
if (loc->filenum != -1u && loc->u.view && lss->head) if (loc->filenum != -1u && loc->u.view && lss->head)
set_or_check_view (e, (struct line_entry *) lss->ptail, lss->head); set_or_check_view (e, line_entry_at_tail (lss->head, lss->ptail),
lss->head);
*lss->ptail = e; *lss->ptail = e;
lss->ptail = &e->next; lss->ptail = &e->next;
@@ -3194,8 +3203,7 @@ dwarf2_finish (void)
/* Link the first view of subsequent subsections to the /* Link the first view of subsequent subsections to the
previous view. */ previous view. */
if (lss->head && lss->head->loc.u.view) if (lss->head && lss->head->loc.u.view)
set_or_check_view (lss->head, set_or_check_view (lss->head, line_entry_at_tail (s->head, ptail),
!s->head ? NULL : (struct line_entry *)ptail,
s->head ? s->head->head : NULL); s->head ? s->head->head : NULL);
*ptail = lss->head; *ptail = lss->head;
lss->head = NULL; lss->head = NULL;