diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -26,6 +26,7 @@ __algorithm/generate.h __algorithm/generate_n.h __algorithm/half_positive.h + __algorithm/in_fun_result.h __algorithm/in_in_out_result.h __algorithm/in_in_result.h __algorithm/in_out_out_result.h diff --git a/libcxx/include/__algorithm/in_fun_result.h b/libcxx/include/__algorithm/in_fun_result.h new file mode 100644 --- /dev/null +++ b/libcxx/include/__algorithm/in_fun_result.h @@ -0,0 +1,49 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// 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 +// +//===----------------------------------------------------------------------===// + +#ifndef _LIBCPP___ALGORITHM_IN_FUN_RESULT_H +#define _LIBCPP___ALGORITHM_IN_FUN_RESULT_H + +#include <__concepts/convertible_to.h> +#include <__config> +#include <__utility/move.h> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif + +_LIBCPP_BEGIN_NAMESPACE_STD + +#ifndef _LIBCPP_HAS_NO_CONCEPTS + +namespace ranges { +template +struct in_fun_result { + [[no_unique_address]] _Ip in; + [[no_unique_address]] _Fp fun; + + template + requires convertible_to && convertible_to + _LIBCPP_HIDE_FROM_ABI constexpr operator in_fun_result<_I2, _F2>() const & { + return {in, fun}; + } + + template + requires convertible_to<_Ip, _I2> && convertible_to<_Fp, _F2> + _LIBCPP_HIDE_FROM_ABI constexpr operator in_fun_result<_I2, _F2>() && { + return {std::move(in), std::move(fun)}; + } +}; +} // namespace ranges + +#endif // _LIBCPP_HAS_NO_RANGES + +_LIBCPP_END_NAMESPACE_STD + +#endif // _LIBCPP___ALGORITHM_IN_FUN_RESULT_H diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -19,6 +19,9 @@ { namespace ranges { + template + struct in_fun_result; // since C++20 + template struct in_in_result; // since C++20 @@ -27,6 +30,9 @@ template struct in_out_out_result; // since C++20 + + template + struct in_out_result; // since C++20 } template @@ -661,13 +667,6 @@ template constexpr bool // constexpr in C++20 prev_permutation(BidirectionalIterator first, BidirectionalIterator last, Compare comp); - -namespace ranges { -// [algorithms.results], algorithm result types -template - struct in_out_result; -} - } // std */ @@ -712,6 +711,7 @@ #include <__algorithm/generate.h> #include <__algorithm/generate_n.h> #include <__algorithm/half_positive.h> +#include <__algorithm/in_fun_result.h> #include <__algorithm/in_in_out_result.h> #include <__algorithm/in_in_result.h> #include <__algorithm/in_out_out_result.h> diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap --- a/libcxx/include/module.modulemap +++ b/libcxx/include/module.modulemap @@ -247,6 +247,7 @@ module generate { private header "__algorithm/generate.h" } module generate_n { private header "__algorithm/generate_n.h" } module half_positive { private header "__algorithm/half_positive.h" } + module in_fun_result { private header "__algorithm/in_fun_result.h" } module in_in_out_result { private header "__algorithm/in_in_out_result.h" } module in_in_result { private header "__algorithm/in_in_result.h" } module in_out_out_result { private header "__algorithm/in_out_out_result.h" } diff --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_fun_result.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_fun_result.module.verify.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_fun_result.module.verify.cpp @@ -0,0 +1,15 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// +//===----------------------------------------------------------------------===// + +// REQUIRES: modules-build + +// WARNING: This test was generated by 'generate_private_header_tests.py' +// and should not be edited manually. + +// expected-error@*:* {{use of private header from outside its module: '__algorithm/in_fun_result.h'}} +#include <__algorithm/in_fun_result.h> diff --git a/libcxx/test/std/algorithms/algorithms.results/in_fun_result.pass.cpp b/libcxx/test/std/algorithms/algorithms.results/in_fun_result.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/algorithms/algorithms.results/in_fun_result.pass.cpp @@ -0,0 +1,101 @@ +//===----------------------------------------------------------------------===// +// +// 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: libcpp-has-no-incomplete-ranges + +// template +// struct in_fun_result; + +#include +#include +#include +#include + +#include "MoveOnly.h" + +struct A { + explicit A(int); +}; +// no implicit conversion +static_assert(!std::is_constructible_v, std::ranges::in_fun_result>); + +struct B { + B(int); +}; +// implicit conversion +static_assert(std::is_constructible_v, std::ranges::in_fun_result>); +static_assert(std::is_constructible_v, std::ranges::in_fun_result&>); +static_assert(std::is_constructible_v, const std::ranges::in_fun_result>); +static_assert(std::is_constructible_v, const std::ranges::in_fun_result&>); + +struct C { + C(int&); +}; +// has to be convertible via const& +static_assert(!std::is_constructible_v, std::ranges::in_fun_result&>); + +static_assert(std::is_convertible_v&, std::ranges::in_fun_result>); +static_assert(std::is_convertible_v&, std::ranges::in_fun_result>); +static_assert(std::is_convertible_v&&, std::ranges::in_fun_result>); +static_assert(std::is_convertible_v&&, std::ranges::in_fun_result>); + +// should be move constructible +static_assert(std::is_move_constructible_v>); +static_assert(std::is_move_constructible_v>); + +// should not copy constructible with move-only type +static_assert(!std::is_copy_constructible_v>); +static_assert(!std::is_copy_constructible_v>); + +struct NotConvertible {}; +// conversions should not work if there is no conversion +static_assert(!std::is_convertible_v, + std::ranges::in_fun_result>); +static_assert(!std::is_convertible_v, + std::ranges::in_fun_result>); + +template +struct ConvertibleFrom { + constexpr ConvertibleFrom(T c) : content{c} {} + T content; +}; + +constexpr bool test() { + { + std::ranges::in_fun_result res{10, 0.}; + assert(res.in == 10); + assert(res.fun == 0.); + std::ranges::in_fun_result, ConvertibleFrom> res2 = res; + assert(res2.in.content == 10); + assert(res2.fun.content == 0.); + } + { + std::ranges::in_fun_result res{MoveOnly{}, 2}; + assert(res.in.get() == 1); + assert(res.fun == 2); + auto res2 = static_cast>(std::move(res)); + assert(res.in.get() == 0); + assert(res2.in.get() == 1); + assert(res2.fun == 2); + } + { + auto [in, fun] = std::ranges::in_fun_result{1, 2}; + assert(in == 1); + assert(fun == 2); + } + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp b/libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp --- a/libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp +++ b/libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp @@ -44,3 +44,7 @@ static_assert(sizeof(std::ranges::in_out_out_result) == 2); static_assert(sizeof(std::ranges::in_out_out_result) == sizeof(int)); static_assert(sizeof(std::ranges::in_out_out_result) == 3); + +static_assert(sizeof(std::ranges::in_fun_result) == sizeof(int)); +static_assert(sizeof(std::ranges::in_fun_result) == sizeof(int)); +static_assert(sizeof(std::ranges::in_fun_result) == 2);