public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-9902] libstdc++: Implement missing P0896R4 changes to reverse_iterator [PR100639]
@ 2021-06-10 18:49 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2021-06-10 18:49 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:c8bd39bc10eac3028dbf509b27457172360e6e8c
commit r10-9902-gc8bd39bc10eac3028dbf509b27457172360e6e8c
Author: Patrick Palka <ppalka@redhat.com>
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<long long>).
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<_Iterator>,
random_access_iterator_tag,
@@ -148,6 +148,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
using iterator_category
= __detail::__clamp_iter_cat<typename __traits_type::iterator_category,
random_access_iterator_tag>;
+ 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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=c++2a" }
+// { dg-do compile { target c++2a } }
+
+// PR libstdc++/100639
+
+#include <iterator>
+#include <ranges>
+
+void
+test01()
+{
+ using iter = std::ranges::iterator_t<std::ranges::iota_view<long long>>;
+ using riter = std::reverse_iterator<iter>;
+ static_assert(std::same_as<std::iter_reference_t<iter>,
+ std::iter_reference_t<riter>>);
+ static_assert(std::same_as<std::iter_value_t<iter>,
+ std::iter_value_t<riter>>);
+ static_assert(std::same_as<std::iter_difference_t<iter>,
+ std::iter_difference_t<riter>>);
+}
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<const V> );
}
+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();
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-10 18:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-10 18:49 [gcc r10-9902] libstdc++: Implement missing P0896R4 changes to reverse_iterator [PR100639] Patrick Palka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).