mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-09 04:21:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

* dwarf2read.c (read_die_and_children): Ignore NULL DIEs.

Browse Source 
(read_die_and_siblings): Likewise.  Do not add padding DIEs to the
	sibling list.
	(read_full_die): Do not allocate DIEs for abbrev 0.
	(follow_die_ref): Correct error message.
This commit is contained in:
Daniel Jacobowitz 2008-08-20 19:27:58 +00:00
parent 97a2d1d342
commit 1d325ec1dc
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2008-08-20 Daniel Jacobowitz <dan@codesourcery.com>
* dwarf2read.c (read_die_and_children): Ignore NULL DIEs.
(read_die_and_siblings): Likewise. Do not add padding DIEs to the
sibling list.
(read_full_die): Do not allocate DIEs for abbrev 0.
(follow_die_ref): Correct error message.
2008-08-20 Pedro Alves <pedro@codesourcery.com>
* linespec.c (symtab_from_filename): Also throw NOT_FOUND_ERROR if

32
gdb/dwarf2read.c
View File

@ -5141,6 +5141,11 @@ read_die_and_children (gdb_byte *info_ptr, bfd *abfd,
int has_children;
cur_ptr = read_full_die (&die, abfd, info_ptr, cu, &has_children);
if (die == NULL)
{
*new_info_ptr = cur_ptr;
return NULL;
}
store_in_ref_table (die->offset, die, cu);
if (has_children)
@ -5180,24 +5185,18 @@ read_die_and_siblings (gdb_byte *info_ptr, bfd *abfd,
struct die_info *die
= read_die_and_children (cur_ptr, abfd, cu, &cur_ptr, parent);
if (!first_die)
{
first_die = die;
}
else
{
last_sibling->sibling = die;
}
if (die->tag == 0)
if (die == NULL)
{
*new_info_ptr = cur_ptr;
return first_die;
}
if (!first_die)
first_die = die;
else
{
last_sibling = die;
}
last_sibling->sibling = die;
last_sibling = die;
}
}
@ -6048,10 +6047,7 @@ read_full_die (struct die_info **diep, bfd *abfd, gdb_byte *info_ptr,
info_ptr += bytes_read;
if (!abbrev_number)
{
die = dwarf_alloc_die ();
die->tag = 0;
die->abbrev = abbrev_number;
*diep = die;
*diep = NULL;
*has_children = 0;
return info_ptr;
}
@ -9240,7 +9236,7 @@ follow_die_ref (struct die_info *src_die, struct attribute *attr,
error (_("Dwarf Error: Cannot find DIE at 0x%lx referenced from DIE "
"at 0x%lx [in module %s]"),
(long) src_die->offset, (long) offset, cu->objfile->name);
(long) offset, (long) src_die->offset, cu->objfile->name);
return NULL;
}