From 19667c82e479dc2bf8351588ed57aff90220b748 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Tue, 28 Apr 2020 16:34:24 -0400 Subject: libstdc++: Fix subrange::advance and subrange::prev (LWG 3433) This implements the proposed resolution of LWG 3433, which fixes subrange::advance when called with a negative argument. libstdc++-v3/ChangeLog: LWG 3433 subrange::advance(n) has UB when n < 0 * include/std/ranges (subrange::prev): Fix typo. (subrange::advance): Handle a negative argument as per the proposed resolution of LWG 3433. * testsuite/std/ranges/subrange/lwg3433.cc: New test. --- libstdc++-v3/ChangeLog | 8 ++ libstdc++-v3/include/std/ranges | 25 +++--- .../testsuite/std/ranges/subrange/lwg3433.cc | 96 ++++++++++++++++++++++ 3 files changed, 119 insertions(+), 10 deletions(-) create mode 100644 libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.cc (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f6de19d..f2ddc5e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2020-04-28 Patrick Palka + + LWG 3433 subrange::advance(n) has UB when n < 0 + * include/std/ranges (subrange::prev): Fix typo. + (subrange::advance): Handle a negative argument as per the proposed + resolution of LWG 3433. + * testsuite/std/ranges/subrange/lwg3433.cc: New test. + 2020-04-28 Jonathan Wakely Iain Sandoe diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 8f91598..0c602c7 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -353,23 +353,28 @@ namespace ranges requires bidirectional_iterator<_It> { auto __tmp = *this; - __tmp.advance(--__n); + __tmp.advance(-__n); return __tmp; } constexpr subrange& advance(iter_difference_t<_It> __n) { + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3433. subrange::advance(n) has UB when n < 0 + if constexpr (bidirectional_iterator<_It>) + if (__n < 0) + { + ranges::advance(_M_begin, __n); + if constexpr (_S_store_size) + _M_size._M_size += __detail::__to_unsigned_like(-__n); + return *this; + } + + __glibcxx_assert(__n >= 0); + auto __d = __n - ranges::advance(_M_begin, __n, _M_end); if constexpr (_S_store_size) - { - auto __d = __n - ranges::advance(_M_begin, __n, _M_end); - if (__d >= 0) - _M_size._M_size -= __detail::__to_unsigned_like(__d); - else - _M_size._M_size += __detail::__to_unsigned_like(-__d); - } - else - ranges::advance(_M_begin, __n, _M_end); + _M_size._M_size -= __detail::__to_unsigned_like(__d); return *this; } }; diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.cc b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.cc new file mode 100644 index 0000000..9eb0489 --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.cc @@ -0,0 +1,96 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include +#include +#include + +using __gnu_test::bidirectional_iterator_wrapper; +using __gnu_test::forward_iterator_wrapper; +using __gnu_test::test_range; +using __gnu_test::test_sized_range; +using __gnu_test::test_sized_range_sized_sent; + +namespace ranges = std::ranges; + +template +void +test01() +{ + int x[] = {1,2,3,4,5}; + Container r{x}; + ranges::subrange sr = r; + constexpr bool sized_range_p = ranges::sized_range; + constexpr bool bidirectional_p = ranges::bidirectional_range; + VERIFY( ranges::equal(sr, (int[]){1,2,3,4,5}) ); + if constexpr (sized_range_p) + VERIFY( sr.size() == 5 ); + + sr = sr.next(); + VERIFY( ranges::equal(sr, (int[]){2,3,4,5}) ); + if constexpr (sized_range_p) + VERIFY( sr.size() == 4 ); + + sr = std::move(sr).next(2); + VERIFY( ranges::equal(sr, (int[]){4,5}) ); + if constexpr (sized_range_p) + VERIFY( sr.size() == 2 ); + + if constexpr (bidirectional_p) + { + sr = sr.prev(2); + VERIFY( ranges::equal(sr, (int[]){2,3,4,5}) ); + if constexpr (sized_range_p) + VERIFY( sr.size() == 4 ); + + sr = sr.prev(); + VERIFY( ranges::equal(sr, (int[]){1,2,3,4,5}) ); + if constexpr (sized_range_p) + VERIFY( sr.size() == 5 ); + } + else + sr = r; + + sr.advance(1); + VERIFY( ranges::equal(sr, (int[]){2,3,4,5}) ); + if constexpr (sized_range_p) + VERIFY( sr.size() == 4 ); + + if constexpr (bidirectional_p) + { + sr.advance(-1); + VERIFY( ranges::equal(sr, (int[]){1,2,3,4,5}) ); + if constexpr (sized_range_p) + VERIFY( sr.size() == 5 ); + } +} + +int +main() +{ + test01>(); + test01>(); + test01>(); + + test01>(); + test01>(); + test01>(); +} -- cgit v1.1