[libcxx-commits] [libcxx] 553ab7a - [libc++] Remove operator-> from iterator archetypes that don't need it
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Mar 10 12:52:47 PST 2022
Author: Louis Dionne
Date: 2022-03-10T15:52:34-05:00
New Revision: 553ab7a090dce9d04f4569a99761fa5917df54a3
URL: https://github.com/llvm/llvm-project/commit/553ab7a090dce9d04f4569a99761fa5917df54a3
DIFF: https://github.com/llvm/llvm-project/commit/553ab7a090dce9d04f4569a99761fa5917df54a3.diff
LOG: [libc++] Remove operator-> from iterator archetypes that don't need it
operator-> is not a requirement for most iterators, so remove it. To
account for this change, the `common_iterator.operator->` test needs to
be refactored quite a bit -- improve test coverage while we're at it.
Differential Revision: https://reviews.llvm.org/D118400
Added:
Modified:
libcxx/test/std/iterators/predef.iterators/iterators.common/arrow.pass.cpp
libcxx/test/std/iterators/predef.iterators/iterators.common/iterator_traits.compile.pass.cpp
libcxx/test/support/test_iterators.h
Removed:
################################################################################
diff --git a/libcxx/test/std/iterators/predef.iterators/iterators.common/arrow.pass.cpp b/libcxx/test/std/iterators/predef.iterators/iterators.common/arrow.pass.cpp
index f404f0278a550..016030425b880 100644
--- a/libcxx/test/std/iterators/predef.iterators/iterators.common/arrow.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/iterators.common/arrow.pass.cpp
@@ -14,71 +14,79 @@
#include <iterator>
#include <cassert>
+#include <concepts>
+#include "test_iterators.h"
#include "test_macros.h"
#include "types.h"
void test() {
- int buffer[8] = {1, 2, 3, 4, 5, 6, 7, 8};
-
- // Case 2: http://eel.is/c++draft/iterators.common#common.iter.access-5.2
- {
- auto iter1 = simple_iterator<int*>(buffer);
- auto commonIter1 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
- const auto commonIter2 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
-
- assert(commonIter1.operator->() == buffer);
- assert(commonIter2.operator->() == buffer);
- }
-
- // Case 3: http://eel.is/c++draft/iterators.common#common.iter.access-5.3
- {
- auto iter1 = value_iterator<int*>(buffer);
- auto commonIter1 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
- const auto commonIter2 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
-
- assert(*commonIter1.operator->().operator->() == 1);
- assert(*commonIter2.operator->().operator->() == 1);
- }
-
- // Case 3: http://eel.is/c++draft/iterators.common#common.iter.access-5.3
- {
- auto iter1 = void_plus_plus_iterator<int*>(buffer);
- auto commonIter1 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
- const auto commonIter2 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
-
- assert(*commonIter1.operator->().operator->() == 1);
- assert(*commonIter2.operator->().operator->() == 1);
- }
-
// Case 1: http://eel.is/c++draft/iterators.common#common.iter.access-5.1
{
- auto iter1 = cpp17_input_iterator<int*>(buffer);
- auto commonIter1 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
- const auto commonIter2 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
-
- assert(base(commonIter1.operator->()) == buffer);
- assert(base(commonIter2.operator->()) == buffer);
+ auto check = []<class Iterator>() {
+ int buffer[8] = {1, 2, 3, 4, 5, 6, 7, 8};
+ Iterator iter(buffer);
+ using Common = std::common_iterator<Iterator, sentinel_wrapper<Iterator>>;
+
+ Common common(iter);
+ std::same_as<Iterator> auto result = common.operator->();
+ assert(base(result) == buffer);
+
+ Common const ccommon(iter);
+ std::same_as<Iterator> auto cresult = ccommon.operator->();
+ assert(base(cresult) == buffer);
+ };
+
+ check.operator()<contiguous_iterator<int*>>();
+ check.operator()<int*>();
}
- // Case 1: http://eel.is/c++draft/iterators.common#common.iter.access-5.1
+ // Case 2: http://eel.is/c++draft/iterators.common#common.iter.access-5.2
{
- auto iter1 = forward_iterator<int*>(buffer);
- auto commonIter1 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
- const auto commonIter2 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
-
- assert(base(commonIter1.operator->()) == buffer);
- assert(base(commonIter2.operator->()) == buffer);
+ auto check = []<class Iterator>() {
+ int buffer[8] = {1, 2, 3, 4, 5, 6, 7, 8};
+ Iterator iter(buffer);
+ using Common = std::common_iterator<Iterator, sentinel_type<int*>>;
+
+ Common common(iter);
+ std::same_as<int*> auto result = common.operator->();
+ assert(result == buffer);
+
+ Common const ccommon(iter);
+ std::same_as<int*> auto cresult = ccommon.operator->();
+ assert(cresult == buffer);
+ };
+
+ check.operator()<simple_iterator<int*>>();
+ check.operator()<cpp17_input_iterator<int*>>();
+ // cpp20_input_iterator can't be used with common_iterator because it's not copyable
+ check.operator()<forward_iterator<int*>>();
+ check.operator()<bidirectional_iterator<int*>>();
+ check.operator()<random_access_iterator<int*>>();
}
- // Case 1: http://eel.is/c++draft/iterators.common#common.iter.access-5.1
+ // Case 3: http://eel.is/c++draft/iterators.common#common.iter.access-5.3
{
- auto iter1 = random_access_iterator<int*>(buffer);
- auto commonIter1 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
- const auto commonIter2 = std::common_iterator<decltype(iter1), sentinel_type<int*>>(iter1);
-
- assert(base(commonIter1.operator->()) == buffer);
- assert(base(commonIter2.operator->()) == buffer);
+ auto check = []<class Iterator>() {
+ int buffer[8] = {1, 2, 3, 4, 5, 6, 7, 8};
+ Iterator iter(buffer);
+ using Common = std::common_iterator<Iterator, sentinel_type<int*>>;
+
+ Common common(iter);
+ auto proxy = common.operator->();
+ std::same_as<int const*> auto result = proxy.operator->();
+ assert(result != buffer); // we copied to a temporary proxy
+ assert(*result == *buffer);
+
+ Common const ccommon(iter);
+ auto cproxy = ccommon.operator->();
+ std::same_as<int const*> auto cresult = cproxy.operator->();
+ assert(cresult != buffer); // we copied to a temporary proxy
+ assert(*cresult == *buffer);
+ };
+
+ check.operator()<value_iterator<int*>>();
+ check.operator()<void_plus_plus_iterator<int*>>();
}
}
diff --git a/libcxx/test/std/iterators/predef.iterators/iterators.common/iterator_traits.compile.pass.cpp b/libcxx/test/std/iterators/predef.iterators/iterators.common/iterator_traits.compile.pass.cpp
index e2f744ae420a3..dccc84dce5e97 100644
--- a/libcxx/test/std/iterators/predef.iterators/iterators.common/iterator_traits.compile.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/iterators.common/iterator_traits.compile.pass.cpp
@@ -91,7 +91,7 @@ void test() {
static_assert(std::same_as<IterTraits::iterator_category, std::input_iterator_tag>);
static_assert(std::same_as<IterTraits::value_type, int>);
static_assert(std::same_as<IterTraits::
diff erence_type, std::ptr
diff _t>);
- static_assert(std::same_as<IterTraits::pointer, const Iter&>);
+ static_assert(std::same_as<IterTraits::pointer, int*>);
static_assert(std::same_as<IterTraits::reference, int&>);
}
{
@@ -103,7 +103,7 @@ void test() {
static_assert(std::same_as<IterTraits::iterator_category, std::forward_iterator_tag>);
static_assert(std::same_as<IterTraits::value_type, int>);
static_assert(std::same_as<IterTraits::
diff erence_type, std::ptr
diff _t>);
- static_assert(std::same_as<IterTraits::pointer, const Iter&>);
+ static_assert(std::same_as<IterTraits::pointer, int*>);
static_assert(std::same_as<IterTraits::reference, int&>);
}
{
@@ -115,7 +115,7 @@ void test() {
static_assert(std::same_as<IterTraits::iterator_category, std::forward_iterator_tag>);
static_assert(std::same_as<IterTraits::value_type, int>);
static_assert(std::same_as<IterTraits::
diff erence_type, std::ptr
diff _t>);
- static_assert(std::same_as<IterTraits::pointer, const Iter&>);
+ static_assert(std::same_as<IterTraits::pointer, int*>);
static_assert(std::same_as<IterTraits::reference, int&>);
}
diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h
index a272cc599caf1..a2c7043a04225 100644
--- a/libcxx/test/support/test_iterators.h
+++ b/libcxx/test/support/test_iterators.h
@@ -71,7 +71,6 @@ class cpp17_input_iterator
TEST_CONSTEXPR cpp17_input_iterator(const cpp17_input_iterator<U, T>& u) : it_(u.it_) {}
TEST_CONSTEXPR reference operator*() const {return *it_;}
- TEST_CONSTEXPR pointer operator->() const {return it_;}
TEST_CONSTEXPR_CXX14 cpp17_input_iterator& operator++() {++it_; return *this;}
TEST_CONSTEXPR_CXX14 cpp17_input_iterator operator++(int) {return cpp17_input_iterator(it_++);}
@@ -107,7 +106,6 @@ class forward_iterator
TEST_CONSTEXPR forward_iterator(const forward_iterator<U>& u) : it_(u.it_) {}
TEST_CONSTEXPR reference operator*() const {return *it_;}
- TEST_CONSTEXPR pointer operator->() const {return it_;}
TEST_CONSTEXPR_CXX14 forward_iterator& operator++() {++it_; return *this;}
TEST_CONSTEXPR_CXX14 forward_iterator operator++(int) {return forward_iterator(it_++);}
@@ -140,7 +138,6 @@ class bidirectional_iterator
TEST_CONSTEXPR bidirectional_iterator(const bidirectional_iterator<U>& u) : it_(u.it_) {}
TEST_CONSTEXPR reference operator*() const {return *it_;}
- TEST_CONSTEXPR pointer operator->() const {return it_;}
TEST_CONSTEXPR_CXX14 bidirectional_iterator& operator++() {++it_; return *this;}
TEST_CONSTEXPR_CXX14 bidirectional_iterator& operator--() {--it_; return *this;}
@@ -175,7 +172,6 @@ class random_access_iterator
TEST_CONSTEXPR random_access_iterator(const random_access_iterator<U>& u) : it_(u.it_) {}
TEST_CONSTEXPR_CXX14 reference operator*() const {return *it_;}
- TEST_CONSTEXPR_CXX14 pointer operator->() const {return it_;}
TEST_CONSTEXPR_CXX14 reference operator[](
diff erence_type n) const {return it_[n];}
TEST_CONSTEXPR_CXX14 random_access_iterator& operator++() {++it_; return *this;}
More information about the libcxx-commits
mailing list