From patchwork Thu May 11 14:48:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 69158 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4872A3855587 for ; Thu, 11 May 2023 14:50:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4872A3855587 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683816603; bh=BZ00mZxZrk5k6eR4vHTg6gMRMieLKt+qqu7mVQr6o2U=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=LkC+qJ+ac7dGoXBmVdKH/QwPWghTNf9Gum3eEP8Dgq4XW0GhoALXkW7H8JR2AsCGh RIo3sofV764/qn36xlo3dlJMQmo7Os1aLLeGf91o5SRFhl/2nIAPG4xTfIN31YkqaW lcmWNSgZtMw4hFgiZ4TydERlc/X3VMQejrn5CwvM= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id C902B3857735 for ; Thu, 11 May 2023 14:48:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C902B3857735 Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (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 B048E1E12E; Thu, 11 May 2023 10:48:34 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 06/12] gdbsupport: add missing increment/decrement operators to reference_to_pointer_iterator Date: Thu, 11 May 2023 10:48:26 -0400 Message-Id: <20230511144832.17974-7-simon.marchi@efficios.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230511144832.17974-1-simon.marchi@efficios.com> References: <20230511144832.17974-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3497.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE 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-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Using the following patch, I would get this build failure: CXX breakpoint.o In file included from /usr/include/c++/13.1.1/bits/stl_algobase.h:66, from /usr/include/c++/13.1.1/bits/hashtable_policy.h:36, from /usr/include/c++/13.1.1/bits/hashtable.h:35, from /usr/include/c++/13.1.1/bits/unordered_map.h:33, from /usr/include/c++/13.1.1/unordered_map:41, from /usr/include/c++/13.1.1/functional:63, from /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/ptid.h:35, from /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/common-defs.h:206, from /home/smarchi/src/binutils-gdb/gdb/defs.h:26, from /home/smarchi/src/binutils-gdb/gdb/breakpoint.c:20: /usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h: In instantiation of ‘constexpr void std::__advance(_BidirectionalIterator&, _Distance, bidirectional_iterator_tag) [with _BidirectionalIterator = reference_to_pointer_iterator > >; _Distance = long int]’: /usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:224:21: required from ‘constexpr void std::advance(_InputIterator&, _Distance) [with _InputIterator = reference_to_pointer_iterator > >; _Distance = long int]’ /usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:237:19: required from ‘constexpr _InputIterator std::next(_InputIterator, typename iterator_traits<_Iter>::difference_type) [with _InputIterator = reference_to_pointer_iterator > >; typename iterator_traits<_Iter>::difference_type = long int]’ /home/smarchi/src/binutils-gdb/gdb/breakpoint.c:1073:19: required from here /usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:179:11: error: no match for ‘operator--’ (operand type is ‘reference_to_pointer_iterator > >’) 179 | --__i; | ^~~~~ This points out that while intrusive_list_iterator has an operator--, the reference_to_pointer_iterator wrapper does not. I'm not to sure why the compiler chooses the overload of __advance that accepts a _BidirectionalIterator, given that reference_to_pointer_iterator can't be decremented, but adding those operators seems like the right thing to do in any case, for completeness. Change-Id: I8e2044b6734fadf0f21093047cf35bb7080dbdc3 --- gdbsupport/reference-to-pointer-iterator.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gdbsupport/reference-to-pointer-iterator.h b/gdbsupport/reference-to-pointer-iterator.h index 792659b1611f..1579d4d26e9c 100644 --- a/gdbsupport/reference-to-pointer-iterator.h +++ b/gdbsupport/reference-to-pointer-iterator.h @@ -68,6 +68,24 @@ struct reference_to_pointer_iterator return *this; } + self_type &operator++ (int) + { + m_it++; + return *this; + } + + self_type &operator-- () + { + --m_it; + return *this; + } + + self_type &operator-- (int) + { + m_it--; + return *this; + } + bool operator== (const self_type &other) const { return m_it == other.m_it; }