From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id F4039385800A; Wed, 12 Apr 2023 16:11:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F4039385800A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681315861; bh=mPaM6jHbGunMX16YBrsuQlj9rpwexa2rN9UpC48NyWY=; h=From:To:Subject:Date:From; b=Xjl1L7wyKaV0b097vo90d8JzRJYpUd+LkrSn8FFAHmPeuKJ034o9+DmgaE55y0U78 /qIqhLQv9FMjrqP0BODfhzLSIBDlGBfj0dnwl2KGj0a0M2rrk1ioaiNDCXvRuDt7pO CDPhtvJpcp8iL8pA29Kf0GqJ41CNfI+idwZy0hf8= 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 r13-7157] libstdc++: Fix chunk_by_view when value_type& and reference differ [PR108291] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 31eb8f18bbe64613fd8d77c4520c00beeb13598f X-Git-Newrev: ae8f903632c930694640a925b042c87e3bdb7200 Message-Id: <20230412161100.F4039385800A@sourceware.org> Date: Wed, 12 Apr 2023 16:11:00 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ae8f903632c930694640a925b042c87e3bdb7200 commit r13-7157-gae8f903632c930694640a925b042c87e3bdb7200 Author: Patrick Palka Date: Wed Apr 12 12:10:23 2023 -0400 libstdc++: Fix chunk_by_view when value_type& and reference differ [PR108291] PR libstdc++/108291 libstdc++-v3/ChangeLog: * include/std/ranges (chunk_by_view::_M_find_next): Generalize parameter types of the lambda wrapper passed to adjacent_find. (chunk_by_view::_M_find_prev): Likewise. * testsuite/std/ranges/adaptors/chunk_by/1.cc (test04, test05): New tests. Diff: --- libstdc++-v3/include/std/ranges | 8 ++--- .../testsuite/std/ranges/adaptors/chunk_by/1.cc | 35 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index b230ebefcf5..ba71976df8d 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -6742,8 +6742,8 @@ namespace views::__adaptor _M_find_next(iterator_t<_Vp> __current) { __glibcxx_assert(_M_pred.has_value()); - auto __pred = [this](_Tp&& __x, _Tp&& __y) { - return !bool((*_M_pred)(std::forward<_Tp>(__x), std::forward<_Tp>(__y))); + auto __pred = [this](_Tp&& __x, _Up&& __y) { + return !bool((*_M_pred)(std::forward<_Tp>(__x), std::forward<_Up>(__y))); }; auto __it = ranges::adjacent_find(__current, ranges::end(_M_base), __pred); return ranges::next(__it, 1, ranges::end(_M_base)); @@ -6753,8 +6753,8 @@ namespace views::__adaptor _M_find_prev(iterator_t<_Vp> __current) requires bidirectional_range<_Vp> { __glibcxx_assert(_M_pred.has_value()); - auto __pred = [this](_Tp&& __x, _Tp&& __y) { - return !bool((*_M_pred)(std::forward<_Tp>(__y), std::forward<_Tp>(__x))); + auto __pred = [this](_Tp&& __x, _Up&& __y) { + return !bool((*_M_pred)(std::forward<_Up>(__y), std::forward<_Tp>(__x))); }; auto __rbegin = std::make_reverse_iterator(__current); auto __rend = std::make_reverse_iterator(ranges::begin(_M_base)); diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc index f165c7d9a95..a8fceb105e0 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc @@ -61,10 +61,45 @@ test03() ranges::chunk_by_view, ranges::equal_to> r; } +constexpr bool +test04() +{ + // PR libstdc++/108291 + using namespace std::literals; + std::string_view s = "hello"; + auto r = s | views::chunk_by(std::less{}); + VERIFY( ranges::equal(r, + (std::string_view[]){"h"sv, "el"sv, "lo"sv}, + ranges::equal) ); + VERIFY( ranges::equal(r | views::reverse, + (std::string_view[]){"lo"sv, "el"sv, "h"sv}, + ranges::equal) ); + + return true; +} + +void +test05() +{ + // PR libstdc++/109474 + std::vector v = {true, false, true, true, false, false}; + auto r = v | views::chunk_by(std::equal_to{}); + VERIFY( ranges::equal(r, + (std::initializer_list[]) + {{true}, {false}, {true, true}, {false, false}}, + ranges::equal) ); + VERIFY( ranges::equal(r | views::reverse, + (std::initializer_list[]) + {{false, false}, {true, true}, {false}, {true}}, + ranges::equal) ); +} + int main() { static_assert(test01()); test02(); test03(); + static_assert(test04()); + test05(); }