From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 0C58A3856DC0; Fri, 21 Oct 2022 18:27:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C58A3856DC0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666376850; bh=ZYa5aYrbpvY7G/sdWB9UkTWZqhS9r3Hq1nDlDibpio8=; h=From:To:Subject:Date:From; b=dMUP1vsvAVTZA0Zi3IFk8xdIG81IuQZCe7fRLN17q61bWL8PbdN0eJc4aSmR66mz2 HvF/5AmDArhT/eMY/o4L0lu38UO8Y25HpJy957WgF/0DP8qRLGTcudLQMqngA2jU4I 9Bdb2uFyvsNKpz1JPktIrGTg/DPMoqZOxcZMOrqI= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: make inherit_abstract_dies use vector iterators X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: f2423983a8f4b5eba77b1d8510be022d600714b6 X-Git-Newrev: 129d1afcc50c0aa3cf69fb3c5d4d8c825bec1061 Message-Id: <20221021182730.0C58A3856DC0@sourceware.org> Date: Fri, 21 Oct 2022 18:27:30 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D129d1afcc50c= 0aa3cf69fb3c5d4d8c825bec1061 commit 129d1afcc50c0aa3cf69fb3c5d4d8c825bec1061 Author: Simon Marchi Date: Fri Oct 21 09:17:53 2022 -0400 gdb: make inherit_abstract_dies use vector iterators =20 Small cleanup to use std::vector iterators rather than raw pointers. =20 Approved-By: Tom Tromey Change-Id: I8d50dbb3f2d8dad7ff94066a578d523f1f31b590 Diff: --- gdb/dwarf2/read.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 077af064663..071d0c48e99 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -11952,29 +11952,28 @@ inherit_abstract_dies (struct die_info *die, stru= ct dwarf2_cu *cu) if (!offsets.empty ()) { std::sort (offsets.begin (), offsets.end ()); - sect_offset *offsets_end =3D offsets.data () + offsets.size (); - for (sect_offset *offsetp =3D offsets.data () + 1; - offsetp < offsets_end; - offsetp++) - if (offsetp[-1] =3D=3D *offsetp) + + for (auto offsets_it =3D offsets.begin () + 1; + offsets_it < offsets.end (); + ++offsets_it) + if (*(offsets_it - 1) =3D=3D *offsets_it) complaint (_("Multiple children of DIE %s refer " "to DIE %s as their abstract origin"), sect_offset_str (die->sect_off), - sect_offset_str (*offsetp)); + sect_offset_str (*offsets_it)); } =20 - sect_offset *offsetp =3D offsets.data (); - sect_offset *offsets_end =3D offsets.data () + offsets.size (); + auto offsets_it =3D offsets.begin (); die_info *origin_child_die =3D origin_die->child; while (origin_child_die !=3D nullptr && origin_child_die->tag !=3D 0) { /* Is ORIGIN_CHILD_DIE referenced by any of the DIE children? */ - while (offsetp < offsets_end - && *offsetp < origin_child_die->sect_off) - offsetp++; + while (offsets_it < offsets.end () + && *offsets_it < origin_child_die->sect_off) + ++offsets_it; =20 - if (offsetp >=3D offsets_end - || *offsetp > origin_child_die->sect_off) + if (offsets_it =3D=3D offsets.end () + || *offsets_it > origin_child_die->sect_off) { /* Found that ORIGIN_CHILD_DIE is really not referenced. Check whether we're already processing ORIGIN_CHILD_DIE.