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/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,93 @@ +//===----------------------------------------------------------------------===// +// +// 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); + +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; +}; + +static_assert( std::indirectly_movable_storable); +static_assert( std::indirectly_movable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable_storable); +static_assert( std::indirectly_movable_storable); +static_assert(!std::indirectly_movable_storable); +static_assert( std::indirectly_movable_storable);