diff --git a/libcxx/include/__iterator/concepts.h b/libcxx/include/__iterator/concepts.h --- a/libcxx/include/__iterator/concepts.h +++ b/libcxx/include/__iterator/concepts.h @@ -164,6 +164,19 @@ { _VSTD::to_address(__i) } -> same_as>>; }; +template +concept indirectly_movable = + indirectly_readable<_In> && + indirectly_writable<_Out, iter_rvalue_reference_t<_In>>; + +template +concept indirectly_movable_storable = + indirectly_movable<_In, _Out> && + indirectly_writable<_Out, iter_value_t<_In>> && + movable> && + constructible_from, iter_rvalue_reference_t<_In>> && + assignable_from&, iter_rvalue_reference_t<_In>>; + // clang-format on #endif // !defined(_LIBCPP_HAS_NO_RANGES) diff --git a/libcxx/include/iterator b/libcxx/include/iterator --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -91,6 +91,13 @@ template concept random_access_iterator = see below; // since C++20 +// [alg.req.ind.move], concept indirectly_movable +template + concept indirectly_movable = see below; // since C++20 + +template + concept indirectly_movable_storable = see below; // since C++20 + template struct iterator diff --git a/libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable*>); +static_assert(!std::indirectly_movable_storable*>); static_assert(std::bidirectional_iterator); static_assert(!std::random_access_iterator); diff --git a/libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable*>); +static_assert(!std::indirectly_movable_storable*>); static_assert(std::bidirectional_iterator); static_assert(!std::random_access_iterator); diff --git a/libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable); +static_assert(std::indirectly_movable_storable); static_assert(std::bidirectional_iterator); static_assert(!std::random_access_iterator); diff --git a/libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable); +static_assert(std::indirectly_movable_storable); static_assert(std::bidirectional_iterator); static_assert(!std::random_access_iterator); diff --git a/libcxx/test/std/containers/sequences/array/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/sequences/array/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/sequences/array/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/iterator_concept_conformance.compile.pass.cpp @@ -31,6 +31,14 @@ static_assert(std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); static_assert(std::contiguous_iterator); static_assert(!std::indirectly_writable); @@ -42,3 +50,11 @@ static_assert(std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); diff --git a/libcxx/test/std/containers/sequences/deque/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/sequences/deque/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/sequences/deque/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,14 @@ static_assert(std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); static_assert(std::random_access_iterator); static_assert(!std::contiguous_iterator); @@ -45,3 +53,11 @@ static_assert(std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.iter/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.iter/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.iter/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.iter/iterator_concept_conformance.compile.pass.cpp @@ -27,6 +27,10 @@ static_assert(std::sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); @@ -35,3 +39,7 @@ static_assert(std::sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); diff --git a/libcxx/test/std/containers/sequences/list/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/sequences/list/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/sequences/list/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,14 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); static_assert(std::bidirectional_iterator); static_assert(!std::random_access_iterator); @@ -45,3 +53,11 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); diff --git a/libcxx/test/std/containers/sequences/vector.bool/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/sequences/vector.bool/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector.bool/iterator_concept_conformance.compile.pass.cpp @@ -22,30 +22,32 @@ using const_reverse_iterator = std::vector::const_reverse_iterator; using value_type = bool; -static_assert(std::random_access_iterator); -static_assert(std::random_access_iterator); +static_assert( std::random_access_iterator); +static_assert( std::random_access_iterator); static_assert(!std::contiguous_iterator); static_assert(!std::contiguous_iterator); static_assert(!std::indirectly_writable); -static_assert(std::sentinel_for); -static_assert(std::sentinel_for); +static_assert( std::sentinel_for); +static_assert( std::sentinel_for); static_assert(!std::sentinel_for); static_assert(!std::sentinel_for); -static_assert(std::sized_sentinel_for); -static_assert(std::sized_sentinel_for); +static_assert( std::sized_sentinel_for); +static_assert( std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable); +static_assert(std::indirectly_movable_storable); -static_assert(std::random_access_iterator); -static_assert(std::random_access_iterator); +static_assert( std::random_access_iterator); +static_assert( std::random_access_iterator); static_assert(!std::contiguous_iterator); static_assert(!std::contiguous_iterator); static_assert(!std::indirectly_writable); -static_assert(std::sentinel_for); -static_assert(std::sentinel_for); +static_assert( std::sentinel_for); +static_assert( std::sentinel_for); static_assert(!std::sentinel_for); static_assert(!std::sentinel_for); -static_assert(std::sized_sentinel_for); -static_assert(std::sized_sentinel_for); +static_assert( std::sized_sentinel_for); +static_assert( std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); diff --git a/libcxx/test/std/containers/sequences/vector/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/sequences/vector/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/sequences/vector/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/iterator_concept_conformance.compile.pass.cpp @@ -22,28 +22,44 @@ using const_reverse_iterator = std::vector::const_reverse_iterator; using value_type = int; -static_assert(std::contiguous_iterator); -static_assert(std::random_access_iterator); +static_assert( std::contiguous_iterator); +static_assert( std::random_access_iterator); static_assert(!std::contiguous_iterator); -static_assert(std::indirectly_writable); -static_assert(std::sentinel_for); -static_assert(std::sentinel_for); +static_assert( std::indirectly_writable); +static_assert( std::sentinel_for); +static_assert( std::sentinel_for); static_assert(!std::sentinel_for); static_assert(!std::sentinel_for); -static_assert(std::sized_sentinel_for); -static_assert(std::sized_sentinel_for); +static_assert( std::sized_sentinel_for); +static_assert( std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); -static_assert(std::contiguous_iterator); -static_assert(std::random_access_iterator); +static_assert( std::contiguous_iterator); +static_assert( std::random_access_iterator); static_assert(!std::contiguous_iterator); static_assert(!std::indirectly_writable); -static_assert(std::sentinel_for); -static_assert(std::sentinel_for); +static_assert( std::sentinel_for); +static_assert( std::sentinel_for); static_assert(!std::sentinel_for); static_assert(!std::sentinel_for); -static_assert(std::sized_sentinel_for); -static_assert(std::sized_sentinel_for); +static_assert( std::sized_sentinel_for); +static_assert( std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); diff --git a/libcxx/test/std/containers/unord/unord.map/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/unord/unord.map/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/unord/unord.map/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable*>); +static_assert(!std::indirectly_movable_storable*>); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); @@ -57,6 +59,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable*>); +static_assert(!std::indirectly_movable_storable*>); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); diff --git a/libcxx/test/std/containers/unord/unord.multimap/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/unord/unord.multimap/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable*>); +static_assert(!std::indirectly_movable_storable*>); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); @@ -57,6 +59,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable*>); +static_assert(!std::indirectly_movable_storable*>); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); diff --git a/libcxx/test/std/containers/unord/unord.multiset/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/unord/unord.multiset/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable); +static_assert(std::indirectly_movable_storable); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); @@ -57,6 +59,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable); +static_assert(std::indirectly_movable_storable); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); diff --git a/libcxx/test/std/containers/unord/unord.set/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/unord/unord.set/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/unord/unord.set/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/iterator_concept_conformance.compile.pass.cpp @@ -33,6 +33,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable); +static_assert(std::indirectly_movable_storable); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); @@ -56,6 +58,8 @@ static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable); +static_assert(std::indirectly_movable_storable); static_assert(std::forward_iterator); static_assert(!std::bidirectional_iterator); diff --git a/libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp @@ -26,3 +26,5 @@ static_assert(!std::sentinel_for); static_assert(std::sized_sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(std::indirectly_movable); +static_assert(std::indirectly_movable_storable); diff --git a/libcxx/test/std/input.output/filesystems/class.directory_iterator/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_iterator/iterator_concept_conformance.compile.pass.cpp --- a/libcxx/test/std/input.output/filesystems/class.directory_iterator/iterator_concept_conformance.compile.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/class.directory_iterator/iterator_concept_conformance.compile.pass.cpp @@ -24,6 +24,8 @@ static_assert(!std::incrementable); static_assert(std::sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); static_assert(std::input_iterator); static_assert(!std::forward_iterator); @@ -31,3 +33,5 @@ static_assert(!std::incrementable); static_assert(std::sentinel_for); static_assert(!std::sized_sentinel_for); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); diff --git a/libcxx/test/std/iterators/iterator.requirements/alg.req/ind.move.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/alg.req/ind.move.compile.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/iterators/iterator.requirements/alg.req/ind.move.compile.pass.cpp @@ -0,0 +1,172 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// template +// concept indirectly_movable; + +// template +// concept indirectly_movable_storable; + +#include + +#include "test_macros.h" + +struct IndirectlyMovableWithInt { + int& operator*() const; +}; + +struct Empty {}; + +struct MoveOnlyConvertible; +struct AssignableToMoveOnly; + +struct MoveOnly { + MoveOnly(MoveOnly&&) = default; + MoveOnly(MoveOnly const&) = delete; + MoveOnly& operator=(MoveOnly&&) = default; + MoveOnly& operator=(MoveOnly const&) = delete; + MoveOnly() = default; + + MoveOnly& operator=(MoveOnlyConvertible const&) = delete; + MoveOnly& operator=(AssignableToMoveOnly const&); +}; + +struct MoveOnlyWrapper { + using value_type = MoveOnly; + MoveOnly& operator*() const; +}; + +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert( std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert( std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert(!std::indirectly_movable); +static_assert( std::indirectly_movable); +static_assert( std::indirectly_movable); + +struct MoveOnlyConvertible { + operator MoveOnly&() const; +}; + +struct MoveOnlyConvertibleWrapper { + using value_type = MoveOnlyConvertible; + friend MoveOnly iter_move(MoveOnlyConvertibleWrapper const&); + MoveOnly& operator*() const; +}; + +struct AssignableToMoveOnly { + AssignableToMoveOnly() = default; + AssignableToMoveOnly(const MoveOnly&); +}; + +struct AssignableToMoveOnlyWrapper { + using value_type = AssignableToMoveOnly; + friend MoveOnly iter_move(AssignableToMoveOnlyWrapper const&); + MoveOnly& operator*() const; +}; + +struct DeletedMoveCtor { + DeletedMoveCtor(DeletedMoveCtor&&) = delete; + DeletedMoveCtor& operator=(DeletedMoveCtor&&) = default; +}; + +struct CommonType { }; + +struct NotConstructibleFromRefIn { + struct ValueType { + operator CommonType&() const; + }; + + struct ReferenceType { + operator CommonType&() const; + }; + + using value_type = ValueType; + ReferenceType& operator*() const; +}; + +template