From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 29E473851C0A; Thu, 10 Jun 2021 18:57:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29E473851C0A MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-9903] libstdc++: Fix miscellaneous issues with elements_view::_Sentinel [PR100631] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: c8bd39bc10eac3028dbf509b27457172360e6e8c X-Git-Newrev: 648c786bc6451115604c60abcc7977b3c6987ae4 Message-Id: <20210610185755.29E473851C0A@sourceware.org> Date: Thu, 10 Jun 2021 18:57:55 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2021 18:57:55 -0000 https://gcc.gnu.org/g:648c786bc6451115604c60abcc7977b3c6987ae4 commit r10-9903-g648c786bc6451115604c60abcc7977b3c6987ae4 Author: Patrick Palka Date: Tue May 18 00:26:07 2021 -0400 libstdc++: Fix miscellaneous issues with elements_view::_Sentinel [PR100631] libstdc++-v3/ChangeLog: PR libstdc++/100631 * include/std/ranges (elements_view::_Iterator): Also befriend _Sentinel. (elements_view::_Sentinel::_M_equal): Templatize. (elements_view::_Sentinel::_M_distance_from): Split out from ... (elements_view::_Sentinel::operator-): ... here. Depend on _Base2 instead of _Base in the return type. * testsuite/std/ranges/adaptors/elements.cc (test06, test07): New tests. (cherry picked from commit 2e2eef80ac0c21f9533e6791ccf5e29458cbb77c) Diff: --- libstdc++-v3/include/std/ranges | 18 ++++++++----- .../testsuite/std/ranges/adaptors/elements.cc | 31 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index caca68ac0c0..27bbbc8cec4 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3717,16 +3717,22 @@ namespace views requires sized_sentinel_for, iterator_t<_Base>> { return __x._M_current - __y._M_current; } - friend _Sentinel<_Const>; + template friend struct _Sentinel; }; template struct _Sentinel { private: - constexpr bool - _M_equal(const _Iterator<_Const>& __x) const - { return __x._M_current == _M_end; } + template + constexpr bool + _M_equal(const _Iterator<_Const2>& __x) const + { return __x._M_current == _M_end; } + + template + constexpr auto + _M_distance_from(const _Iterator<_Const2>& __i) const + { return _M_end - __i._M_current; } using _Base = elements_view::_Base<_Const>; sentinel_t<_Base> _M_end = sentinel_t<_Base>(); @@ -3767,9 +3773,9 @@ namespace views template> requires sized_sentinel_for, iterator_t<_Base2>> - friend constexpr range_difference_t<_Base> + friend constexpr range_difference_t<_Base2> operator-(const _Sentinel& __x, const _Iterator<_Const2>& __y) - { return __x._M_end - __y._M_current; } + { return __x._M_distance_from(__y); } friend _Sentinel; }; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc index 7718178b3cf..c14f5b9fca3 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc @@ -107,6 +107,35 @@ test05() VERIFY( r2[0] == 1 && r2[1] == 3 ); } +void +test06() +{ + // PR libstdc++/100631 + auto r = views::iota(0) + | views::filter([](int){ return true; }) + | views::take(42) + | views::reverse + | views::transform([](int) { return std::make_pair(42, "hello"); }) + | views::take(42) + | views::keys; + auto b = r.begin(); + auto e = r.end(); + e - b; +} + +void +test07() +{ + // PR libstdc++/100631 comment #2 + auto r = views::iota(0) + | views::transform([](int) { return std::make_pair(42, "hello"); }) + | views::keys; + auto b = ranges::cbegin(r); + auto e = ranges::end(r); + b.base() == e.base(); + b == e; +} + int main() { @@ -114,4 +143,6 @@ main() test02(); test03(); test05(); + test06(); + test07(); }