From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 52913385040D; Thu, 10 Sep 2020 16:09:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 52913385040D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1599754177; bh=JWeVfcLj8E2C0dVhK25MgPANvFBOMjR6k0RZN1wmnMQ=; h=From:To:Subject:Date:From; b=KEn7OBuehoexUVuRg+QMfYt4dHdjwlE+0akg7BTYdgHYX0p03il2PUGAKd6hYSKBr Uci46Oi769M3l1ghFWeegLVjzqCW4p+iNEKFlowfNfzFnX5BO5rCi/yAvd9hPvSFDg HG1MrFukyHOnYZQFgcOF2jMXgaY0sxJpHnIaBMxo= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-3113] libstdc++: Enforce LWG 3472 preconditions on std::counted_iterator X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 0ed757604f4e232324ca798e46f3d8bf7e35b009 X-Git-Newrev: afea21f9612545282db95872021d7587c9d5b0d4 Message-Id: <20200910160937.52913385040D@sourceware.org> Date: Thu, 10 Sep 2020 16:09:37 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2020 16:09:37 -0000 https://gcc.gnu.org/g:afea21f9612545282db95872021d7587c9d5b0d4 commit r11-3113-gafea21f9612545282db95872021d7587c9d5b0d4 Author: Jonathan Wakely Date: Thu Sep 10 17:09:15 2020 +0100 libstdc++: Enforce LWG 3472 preconditions on std::counted_iterator libstdc++-v3/ChangeLog: * include/bits/stl_iterator.h (counted_iterator): Add assertions to check preconditions added by LWG 3472. Diff: --- libstdc++-v3/include/bits/stl_iterator.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index da740e3732e..f29bae92706 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -2036,13 +2036,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr decltype(auto) operator*() noexcept(noexcept(*_M_current)) - { return *_M_current; } + { + __glibcxx_assert( _M_length > 0 ); + return *_M_current; + } constexpr decltype(auto) operator*() const noexcept(noexcept(*_M_current)) requires __detail::__dereferenceable - { return *_M_current; } + { + __glibcxx_assert( _M_length > 0 ); + return *_M_current; + } constexpr counted_iterator& operator++() @@ -2170,14 +2176,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION iter_move(const counted_iterator& __i) noexcept(noexcept(ranges::iter_move(__i._M_current))) requires input_iterator<_It> - { return ranges::iter_move(__i._M_current); } + { + __glibcxx_assert( __i._M_length > 0 ); + return ranges::iter_move(__i._M_current); + } template _It2> friend constexpr void iter_swap(const counted_iterator& __x, const counted_iterator<_It2>& __y) noexcept(noexcept(ranges::iter_swap(__x._M_current, __y._M_current))) - { ranges::iter_swap(__x._M_current, __y._M_current); } + { + __glibcxx_assert( __x._M_length > 0 && __y._M_length > 0 ); + ranges::iter_swap(__x._M_current, __y._M_current); + } private: template friend class counted_iterator;