From 597b90ebacafad94082c0010b74bcf2ac1a23b4f Mon Sep 17 00:00:00 2001 From: Hui Xie Date: Fri, 14 Jan 2022 12:54:02 -0500 Subject: [PATCH] [libc++] Fix __simple_view concept in std::ranges Differential Revision: https://reviews.llvm.org/D116808 --- libcxx/include/__ranges/concepts.h | 4 +- .../simple_view.compile.pass.cpp | 9 +++- .../range.adaptors/range.drop/begin.pass.cpp | 51 ++++++++++++++++++++++ .../range.adaptors/range.join.view/begin.pass.cpp | 25 +++++++++++ .../range.adaptors/range.take/begin.pass.cpp | 15 +++++++ 5 files changed, 101 insertions(+), 3 deletions(-) diff --git a/libcxx/include/__ranges/concepts.h b/libcxx/include/__ranges/concepts.h index fa31074..a9cb15f 100644 --- a/libcxx/include/__ranges/concepts.h +++ b/libcxx/include/__ranges/concepts.h @@ -83,11 +83,11 @@ namespace ranges { movable<_Tp> && enable_view<_Tp>; - template + template concept __simple_view = view<_Range> && range && same_as, iterator_t> && - same_as, iterator_t>; + same_as, sentinel_t>; // [range.refinements], other range refinements template diff --git a/libcxx/test/libcxx/ranges/range.utility.helpers/simple_view.compile.pass.cpp b/libcxx/test/libcxx/ranges/range.utility.helpers/simple_view.compile.pass.cpp index 7aef1ba..fd7427f 100644 --- a/libcxx/test/libcxx/ranges/range.utility.helpers/simple_view.compile.pass.cpp +++ b/libcxx/test/libcxx/ranges/range.utility.helpers/simple_view.compile.pass.cpp @@ -39,7 +39,14 @@ struct DifferentSentinel : std::ranges::view_base { sentinel_wrapper end() const; }; +struct WrongConstSentinel : std::ranges::view_base { + int *begin() const; + sentinel_wrapper end(); + sentinel_wrapper end() const; +}; + static_assert( std::ranges::__simple_view); static_assert(!std::ranges::__simple_view); static_assert(!std::ranges::__simple_view); -static_assert(!std::ranges::__simple_view); +static_assert( std::ranges::__simple_view); +static_assert(!std::ranges::__simple_view); diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp index ca19ef2..2455eee 100644 --- a/libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp @@ -19,11 +19,32 @@ #include #include "test_macros.h" +#include "test_iterators.h" #include "types.h" template concept BeginInvocable = requires(std::ranges::drop_view t) { t.begin(); }; +template +struct MaybeSimpleView : std::ranges::view_base { + int* num_of_non_const_begin_calls; + int* num_of_const_begin_calls; + + constexpr int* begin() { + ++(*num_of_non_const_begin_calls); + return nullptr; + } + constexpr std::conditional_t begin() const { + ++(*num_of_const_begin_calls); + return nullptr; + } + constexpr int* end() const { return nullptr; } + constexpr size_t size() const { return 0; } +}; + +using SimpleView = MaybeSimpleView; +using NonSimpleView = MaybeSimpleView; + constexpr bool test() { // random_access_range && sized_range std::ranges::drop_view dropView1(MoveOnlyView(), 4); @@ -62,6 +83,36 @@ constexpr bool test() { static_assert(!BeginInvocable); + { + static_assert(std::ranges::random_access_range); + static_assert(std::ranges::sized_range); + LIBCPP_STATIC_ASSERT(std::ranges::__simple_view); + int non_const_calls = 0; + int const_calls = 0; + std::ranges::drop_view dropView(SimpleView{{}, &non_const_calls, &const_calls}, 4); + assert(dropView.begin() == nullptr); + assert(non_const_calls == 0); + assert(const_calls == 1); + assert(std::as_const(dropView).begin() == nullptr); + assert(non_const_calls == 0); + assert(const_calls == 2); + } + + { + static_assert(std::ranges::random_access_range); + static_assert(std::ranges::sized_range); + LIBCPP_STATIC_ASSERT(!std::ranges::__simple_view); + int non_const_calls = 0; + int const_calls = 0; + std::ranges::drop_view dropView(NonSimpleView{{}, &non_const_calls, &const_calls}, 4); + assert(dropView.begin() == nullptr); + assert(non_const_calls == 1); + assert(const_calls == 0); + assert(std::as_const(dropView).begin() == nullptr); + assert(non_const_calls == 1); + assert(const_calls == 1); + } + return true; } diff --git a/libcxx/test/std/ranges/range.adaptors/range.join.view/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join.view/begin.pass.cpp index 2441f678..2578564 100644 --- a/libcxx/test/std/ranges/range.adaptors/range.join.view/begin.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.join.view/begin.pass.cpp @@ -19,6 +19,17 @@ #include "test_macros.h" #include "types.h" +struct NonSimpleParentView : std::ranges::view_base { + ChildView* begin() { return nullptr; } + const ChildView* begin() const; + const ChildView* end() const; +}; + +struct SimpleParentView : std::ranges::view_base { + const ChildView* begin() const; + const ChildView* end() const; +}; + constexpr bool test() { int buffer[4][4] = {{1111, 2222, 3333, 4444}, {555, 666, 777, 888}, {99, 1010, 1111, 1212}, {13, 14, 15, 16}}; @@ -86,6 +97,20 @@ constexpr bool test() { assert(*jv.begin() == 1111); } + // !simple-view + { + std::ranges::join_view jv; + static_assert(!std::same_as); + } + + // simple-view && is_reference_v>; + { + std::ranges::join_view jv; + static_assert(std::same_as); + } + return true; } diff --git a/libcxx/test/std/ranges/range.adaptors/range.take/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.take/begin.pass.cpp index 056817f..9092128 100644 --- a/libcxx/test/std/ranges/range.adaptors/range.take/begin.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.take/begin.pass.cpp @@ -21,6 +21,14 @@ #include "test_range.h" #include "types.h" +struct NonCommonSimpleView : std::ranges::view_base { + int* begin() const; + sentinel_wrapper end() const; + size_t size() { return 0; } // deliberately non-const +}; +static_assert(std::ranges::sized_range); +static_assert(!std::ranges::sized_range); + constexpr bool test() { int buffer[8] = {1, 2, 3, 4, 5, 6, 7, 8}; @@ -63,6 +71,13 @@ constexpr bool test() { ASSERT_SAME_TYPE(decltype(tv.begin()), std::counted_iterator); } + // __simple_view && sized_range && !size_range + { + std::ranges::take_view tv{}; + ASSERT_SAME_TYPE(decltype(tv.begin()), std::counted_iterator); + ASSERT_SAME_TYPE(decltype(std::as_const(tv).begin()), std::counted_iterator); + } + return true; } -- 2.7.4