From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 9B1DC3857808; Thu, 10 Jun 2021 18:49:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B1DC3857808 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-9902] libstdc++: Implement missing P0896R4 changes to reverse_iterator [PR100639] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 06b794846f1d8fa55133a257f6d7af39398b9cdc X-Git-Newrev: c8bd39bc10eac3028dbf509b27457172360e6e8c Message-Id: <20210610184952.9B1DC3857808@sourceware.org> Date: Thu, 10 Jun 2021 18:49:52 +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:49:52 -0000 https://gcc.gnu.org/g:c8bd39bc10eac3028dbf509b27457172360e6e8c commit r10-9902-gc8bd39bc10eac3028dbf509b27457172360e6e8c Author: Patrick Palka Date: Thu May 20 14:08:17 2021 -0400 libstdc++: Implement missing P0896R4 changes to reverse_iterator [PR100639] This implements the P0896R4 changes to reverse_iterator's member types value_type, difference_type and reference in C++20 mode, which fixes taking the reverse_iterator of an iterator with a non-integral difference_type (such as iota_view). libstdc++-v3/ChangeLog: PR libstdc++/100639 * include/bits/stl_iterator.h (reverse_iterator::difference_type): In C++20 mode, define in terms of iter_difference_t as per P0896R4. (reverse_iterator::reference): Likewise, but with iter_reference_t. (reverse_iterator::value_type): Likewise, but with iter_value_t. * testsuite/std/ranges/adaptors/reverse.cc (test08): New test. * testsuite/24_iterators/reverse_iterator/100639.cc: New test. (cherry picked from commit d5cbe0f0d4b7bc11f80b2236521f90ec94e95767) Diff: --- libstdc++-v3/include/bits/stl_iterator.h | 9 ++++-- .../24_iterators/reverse_iterator/100639.cc | 37 ++++++++++++++++++++++ .../testsuite/std/ranges/adaptors/reverse.cc | 10 ++++++ 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 3ffd23219cf..3a3df0b7961 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -136,11 +136,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION public: typedef _Iterator iterator_type; - typedef typename __traits_type::difference_type difference_type; typedef typename __traits_type::pointer pointer; +#if __cplusplus <= 201703L + typedef typename __traits_type::difference_type difference_type; typedef typename __traits_type::reference reference; - -#if __cplusplus > 201703L && __cpp_lib_concepts +#else using iterator_concept = conditional_t, random_access_iterator_tag, @@ -148,6 +148,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using iterator_category = __detail::__clamp_iter_cat; + using value_type = iter_value_t<_Iterator>; + using difference_type = iter_difference_t<_Iterator>; + using reference = iter_reference_t<_Iterator>; #endif /** diff --git a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/100639.cc b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/100639.cc new file mode 100644 index 00000000000..358d91dfef1 --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/100639.cc @@ -0,0 +1,37 @@ +// Copyright (C) 2021 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=c++2a" } +// { dg-do compile { target c++2a } } + +// PR libstdc++/100639 + +#include +#include + +void +test01() +{ + using iter = std::ranges::iterator_t>; + using riter = std::reverse_iterator; + static_assert(std::same_as, + std::iter_reference_t>); + static_assert(std::same_as, + std::iter_value_t>); + static_assert(std::same_as, + std::iter_difference_t>); +} diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/reverse.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/reverse.cc index 37d003d11f0..cacaa275335 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/reverse.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/reverse.cc @@ -149,6 +149,15 @@ void test06() static_assert( std::ranges::range ); } +void +test08() +{ + // PR libstdc++/100639 + auto v = views::iota(1701ll, 3000ll) | views::reverse | views::take(5); + for (auto x : v) + ; +} + int main() { @@ -158,4 +167,5 @@ main() test04(); test05(); test06(); + test08(); }