mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-03 23:34:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re: PR28149, debug info with wrong file association

Browse Source 
Fixes segfaults when building aarch64-linux kernel, due to only doing
part of the work necessary when allocating file numbers late.  I'd
missed looping over subsegments, which resulted in some u.filename
entries left around and later interpreted as u.view.

	PR 28149
	* dwarf2dbg.c (purge_generated_debug): Iterate over subsegs too.
	(dwarf2_finish): Call do_allocate_filenum for all subsegs too,
	in a separate loop before subsegs are chained.
This commit is contained in:
Alan Modra 2021-09-20 11:30:41 +09:30
parent 8ac439689f
commit 5b4846283c
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gas/dwarf2dbg.c
View File

@ -792,19 +792,23 @@ purge_generated_debug (void)
for (s = all_segs; s; s = s->next)
{
struct line_subseg *lss = s->head;
struct line_entry *e, *next;
struct line_subseg *lss;
for (e = lss->head; e; e = next)
for (lss = s->head; lss; lss = lss->next)
{
know (e->loc.filenum == -1u);
next = e->next;
free (e);
}
struct line_entry *e, *next;
lss->head = NULL;
lss->ptail = &lss->head;
lss->pmove_tail = &lss->head;
for (e = lss->head; e; e = next)
{
know (e->loc.filenum == -1u);
next = e->next;
free (e);
}
lss->head = NULL;
lss->ptail = &lss->head;
lss->pmove_tail = &lss->head;
}
}
}
@ -2887,15 +2891,21 @@ dwarf2_finish (void)
SEC_READONLY | SEC_DEBUGGING | SEC_OCTETS);
}
for (s = all_segs; s; s = s->next)
{
struct line_subseg *lss;
for (lss = s->head; lss; lss = lss->next)
if (lss->head)
do_allocate_filenum (lss->head);
}
/* For each subsection, chain the debug entries together. */
for (s = all_segs; s; s = s->next)
{
struct line_subseg *lss = s->head;
struct line_entry **ptail = lss->ptail;
if (lss->head && SEG_NORMAL (s->seg))
do_allocate_filenum (lss->head);
/* Reset the initial view of the first subsection of the
section. */
if (lss->head && lss->head->loc.u.view)