From 3b93d61be5a5a93e95783b80c58b297e215badf1 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Tue, 18 May 2021 10:21:27 -0400 Subject: [PATCH] libstdc++: Fix access issue in elements_view::_Sentinel [PR100631] In the earlier commit r12-854 I forgot to also rewrite the other operator- overload in terms of the split-out member function _M_distance_from. libstdc++-v3/ChangeLog: PR libstdc++/100631 * include/std/ranges (elements_view::_Sentinel::operator-): Use _M_distance_from in the other operator- overload too. * testsuite/std/ranges/adaptors/elements.cc (test06): Augment test. (cherry picked from commit 38751c4d5e15bd1c682ac4c868a2c4ce48ca5503) --- libstdc++-v3/include/std/ranges | 2 +- libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index c2ccba942ae5..265e109bc7e5 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3708,7 +3708,7 @@ namespace views::__adaptor requires sized_sentinel_for, iterator_t<_Base2>> friend constexpr range_difference_t<_Base2> operator-(const _Iterator<_Const2>& __x, const _Sentinel& __y) - { return __x._M_current - __y._M_end; } + { return -__y._M_distance_from(__x); } template> diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc index ac3e14b38af3..633fb36725de 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc @@ -131,7 +131,8 @@ test06() | views::keys; auto b = r.begin(); auto e = r.end(); - e - b; + VERIFY( e - b == 42 ); + VERIFY( b - e == -42 ); } void -- 2.47.2