From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 3EEF9398B865; Thu, 10 Jun 2021 18:54:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3EEF9398B865 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 r11-8542] libstdc++: Fix access issue in elements_view::_Sentinel [PR100631] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: fd4db3ddc3639e03f557010b8e0e947e4b51633e X-Git-Newrev: 3b93d61be5a5a93e95783b80c58b297e215badf1 Message-Id: <20210610185432.3EEF9398B865@sourceware.org> Date: Thu, 10 Jun 2021 18:54:32 +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 Jun 2021 18:54:32 -0000 https://gcc.gnu.org/g:3b93d61be5a5a93e95783b80c58b297e215badf1 commit r11-8542-g3b93d61be5a5a93e95783b80c58b297e215badf1 Author: Patrick Palka Date: Tue May 18 10:21:27 2021 -0400 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) Diff: --- 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 c2ccba942ae..265e109bc7e 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 ac3e14b38af..633fb36725d 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