From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id C68C43854171 for ; Fri, 21 Oct 2022 13:21:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C68C43854171 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 29LDL54Z026593 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Oct 2022 09:21:09 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 29LDL54Z026593 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 1E2701E110; Fri, 21 Oct 2022 09:21:05 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Subject: [PATCH 2/2] gdb: make inherit_abstract_dies use vector iterators Date: Fri, 21 Oct 2022 09:21:04 -0400 Message-Id: <20221021132104.1772565-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221021132104.1772565-1-simon.marchi@polymtl.ca> References: <20221021132104.1772565-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 21 Oct 2022 13:21:05 +0000 X-Spam-Status: No, score=-3189.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2022 13:34:16 -0000 Small cleanup to use std::vector iterators rather than raw pointers. Change-Id: I8d50dbb3f2d8dad7ff94066a578d523f1f31b590 --- 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 bf52354c4260..c233b3743140 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -11952,29 +11952,28 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu) if (!offsets.empty ()) { std::sort (offsets.begin (), offsets.end ()); - sect_offset *offsets_end = offsets.data () + offsets.size (); - for (sect_offset *offsetp = offsets.data () + 1; - offsetp < offsets_end; - offsetp++) - if (offsetp[-1] == *offsetp) + + for (auto offsets_it = offsets.begin () + 1; + offsets_it < offsets.end (); + ++offsets_it) + if (*(offsets_it - 1) == *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)); } - sect_offset *offsetp = offsets.data (); - sect_offset *offsets_end = offsets.data () + offsets.size (); + auto offsets_it = offsets.begin (); die_info *origin_child_die = origin_die->child; while (origin_child_die != nullptr && origin_child_die->tag != 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; - if (offsetp >= offsets_end - || *offsetp > origin_child_die->sect_off) + if (offsets_it == 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. -- 2.38.0