From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 3DC2B3858001; Thu, 2 Sep 2021 17:51:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3DC2B3858001 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-3316] libstdc++: Define std::invoke_r for C++23 (P2136R3) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 9695e1c23be5b5c55d572ced152897313ddb96ae X-Git-Newrev: 5b73abd1a5f44f72e36bc7aefd423816083291ea Message-Id: <20210902175111.3DC2B3858001@sourceware.org> Date: Thu, 2 Sep 2021 17:51:11 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2021 17:51:11 -0000 https://gcc.gnu.org/g:5b73abd1a5f44f72e36bc7aefd423816083291ea commit r12-3316-g5b73abd1a5f44f72e36bc7aefd423816083291ea Author: Jonathan Wakely Date: Thu Sep 2 11:54:12 2021 +0100 libstdc++: Define std::invoke_r for C++23 (P2136R3) We already supported this feature as std::__invoke, for internal use. This just adds a public version of it to . Internal uses should continue to include and use std::__invoke so that they don't need to include all of . Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/std/functional (invoke_r): Define. * include/std/version (__cpp_lib_invoke_r): Define. * testsuite/20_util/function_objects/invoke/version.cc: Check for __cpp_lib_invoke_r as well as __cpp_lib_invoke. * testsuite/20_util/function_objects/invoke/4.cc: New test. Diff: --- libstdc++-v3/include/std/functional | 15 ++++++ libstdc++-v3/include/std/version | 1 + .../testsuite/20_util/function_objects/invoke/4.cc | 59 ++++++++++++++++++++++ .../20_util/function_objects/invoke/version.cc | 10 ++++ 4 files changed, 85 insertions(+) diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 131e6629341..0b257926fd5 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -96,6 +96,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return std::__invoke(std::forward<_Callable>(__fn), std::forward<_Args>(__args)...); } + +#if __cplusplus > 202002L +# define __cpp_lib_invoke_r 202106L + + /// Invoke a callable object and convert the result to _Res. + template + requires is_invocable_r_v<_Res, _Callable, _Args...> + constexpr _Res + invoke_r(_Callable&& __fn, _Args&&... __args) + noexcept(is_nothrow_invocable_r_v<_Res, _Callable, _Args...>) + { + return std::__invoke_r<_Res>(std::forward<_Callable>(__fn), + std::forward<_Args>(__args)...); + } +#endif // C++23 #endif // C++17 template 202002L // c++2b +#define __cpp_lib_invoke_r 202106L #define __cpp_lib_is_scoped_enum 202011L #define __cpp_lib_string_contains 202011L #define __cpp_lib_to_underlying 202102L diff --git a/libstdc++-v3/testsuite/20_util/function_objects/invoke/4.cc b/libstdc++-v3/testsuite/20_util/function_objects/invoke/4.cc new file mode 100644 index 00000000000..3ee6711f687 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function_objects/invoke/4.cc @@ -0,0 +1,59 @@ +// { dg-options "-std=gnu++2b" } +// { dg-do compile { target c++23 } } + +#include + +#ifndef __cpp_lib_invoke_r +# error Feature-test macro for invoke_r is missing in +#elif __cpp_lib_invoke_r < 202106L +# error Feature-test macro for invoke_r has the wrong value in +#endif + +constexpr int sq(int i) { return i * i; } + +template +constexpr bool chk(Val&& val, Expected&& exp) +{ + return std::is_same_v && val == exp; +} + +void +test01() +{ + static_assert( chk( std::invoke(sq, 2), 4 ) ); + static_assert( chk( std::invoke_r(sq, 3), 9 ) ); + static_assert( chk( std::invoke_r(sq, 4), '\x10' ) ); +} + +struct abstract { + virtual ~abstract() = 0; + void operator()() noexcept; +}; + +static_assert( noexcept(std::invoke(std::declval())), + "It should be possible to use abstract types with INVOKE" ); + +static_assert( noexcept(std::invoke_r(std::declval())), + "It should be possible to use abstract types with INVOKE" ); + +struct F { + void operator()() &; + void operator()() && noexcept; + int operator()(int); + double* operator()(int, int) noexcept; +}; +struct D { D(void*); }; + +static_assert( !noexcept(std::invoke(std::declval())) ); +static_assert( noexcept(std::invoke(std::declval())) ); +static_assert( !noexcept(std::invoke(std::declval(), 1)) ); +static_assert( noexcept(std::invoke(std::declval(), 1, 2)) ); + +static_assert( !noexcept(std::invoke_r(std::declval())) ); +static_assert( noexcept(std::invoke_r(std::declval())) ); +static_assert( !noexcept(std::invoke_r(std::declval(), 1)) ); +static_assert( !noexcept(std::invoke_r(std::declval(), 1)) ); +static_assert( !noexcept(std::invoke_r(std::declval(), 1)) ); +static_assert( noexcept(std::invoke_r(std::declval(), 1, 2)) ); +static_assert( noexcept(std::invoke_r(std::declval(), 1, 2)) ); +static_assert( !noexcept(std::invoke_r(std::declval(), 1, 2)) ); diff --git a/libstdc++-v3/testsuite/20_util/function_objects/invoke/version.cc b/libstdc++-v3/testsuite/20_util/function_objects/invoke/version.cc index cf1a46a1ada..2dc71aea504 100644 --- a/libstdc++-v3/testsuite/20_util/function_objects/invoke/version.cc +++ b/libstdc++-v3/testsuite/20_util/function_objects/invoke/version.cc @@ -7,3 +7,13 @@ #elif __cpp_lib_invoke < 201411L # error Feature-test macro for invoke has the wrong value in #endif + +#if __cplusplus > 202002L +#ifndef __cpp_lib_invoke_r +# error Feature-test macro for invoke_r is missing in +#elif __cpp_lib_invoke_r < 202106L +# error Feature-test macro for invoke_r has the wrong value in +#endif +#elif defined __cpp_lib_invoke_r +# error __cpp_lib_invoke_r is defined in before C++23 +#endif