espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-27 06:17:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb: make inherit_abstract_dies use vector iterators

Browse Source 
Small cleanup to use std::vector iterators rather than raw pointers.

Approved-By: Tom Tromey <tom@tromey.com>
Change-Id: I8d50dbb3f2d8dad7ff94066a578d523f1f31b590
This commit is contained in:
Simon Marchi
2022-10-21 09:17:53 -04:00
parent f2423983a8
commit 129d1afcc5
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gdb/dwarf2/read.c
View File

@ -11952,29 +11952,28 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
if (!offsets.empty ()) if (!offsets.empty ())
{ {
std::sort (offsets.begin (), offsets.end ()); std::sort (offsets.begin (), offsets.end ());
sect_offset *offsets_end = offsets.data () + offsets.size ();
for (sect_offset *offsetp = offsets.data () + 1; for (auto offsets_it = offsets.begin () + 1;
offsetp < offsets_end; offsets_it < offsets.end ();
offsetp++) ++offsets_it)
if (offsetp[-1] == *offsetp) if (*(offsets_it - 1) == *offsets_it)
complaint (_("Multiple children of DIE %s refer " complaint (_("Multiple children of DIE %s refer "
"to DIE %s as their abstract origin"), "to DIE %s as their abstract origin"),
sect_offset_str (die->sect_off), sect_offset_str (die->sect_off),
sect_offset_str (*offsetp)); sect_offset_str (*offsets_it));
} }
sect_offset *offsetp = offsets.data (); auto offsets_it = offsets.begin ();
sect_offset *offsets_end = offsets.data () + offsets.size ();
die_info *origin_child_die = origin_die->child; die_info *origin_child_die = origin_die->child;
while (origin_child_die != nullptr && origin_child_die->tag != 0) while (origin_child_die != nullptr && origin_child_die->tag != 0)
{ {
/* Is ORIGIN_CHILD_DIE referenced by any of the DIE children? */ /* Is ORIGIN_CHILD_DIE referenced by any of the DIE children? */
while (offsetp < offsets_end while (offsets_it < offsets.end ()
&& *offsetp < origin_child_die->sect_off) && *offsets_it < origin_child_die->sect_off)
offsetp++; ++offsets_it;
if (offsetp >= offsets_end if (offsets_it == offsets.end ()
|| *offsetp > origin_child_die->sect_off) || *offsets_it > origin_child_die->sect_off)
{ {
/* Found that ORIGIN_CHILD_DIE is really not referenced. /* Found that ORIGIN_CHILD_DIE is really not referenced.
Check whether we're already processing ORIGIN_CHILD_DIE. Check whether we're already processing ORIGIN_CHILD_DIE.