libstdc++: Fix std::is_nothrow_invocable_r for uncopyable prvalues [PR91456]

This is the last missing piece of PR 91456.

This also removes the only use of the C++11 version of
std::is_nothrow_invocable, which was just renamed to
__is_nothrow_invocable_lib. We can remove that now.

libstdc++-v3/ChangeLog:

	PR libstdc++/91456
	* include/std/type_traits (__is_nothrow_invocable_lib): Remove.
	(__is_invocable_impl::__nothrow_type): New member type which
	checks if the conversion can throw.
	(__is_nt_invocable_impl): Replace class template with alias
	template to __is_nt_invocable_impl::__nothrow_type.
	* testsuite/20_util/is_nothrow_invocable/91456.cc: New test.
	* testsuite/20_util/is_nothrow_convertible/value.cc: Remove
	macro used by value_ext.cc test.
	* testsuite/20_util/is_nothrow_convertible/value_ext.cc: Remove
	test for non-standard __is_nothrow_invocable_lib trait.
This commit is contained in:
Jonathan Wakely 2022-09-23 13:28:37 +01:00
parent d88319de41
commit 71c828f845
3 changed files with 36 additions and 30 deletions

View file

@ -1451,12 +1451,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
};
#pragma GCC diagnostic pop
// is_nothrow_convertible for C++11
template<typename _From, typename _To>
struct __is_nothrow_convertible_lib
: public __is_nt_convertible_helper<_From, _To>::type
{ };
#if __cplusplus > 201703L
#define __cpp_lib_is_nothrow_convertible 201806L
/// is_nothrow_convertible
@ -2825,7 +2819,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// The primary template is used for invalid INVOKE expressions.
template<typename _Result, typename _Ret,
bool = is_void<_Ret>::value, typename = void>
struct __is_invocable_impl : false_type { };
struct __is_invocable_impl
: false_type
{
using __nothrow_type = false_type; // For is_nothrow_invocable_r
};
// Used for valid INVOKE and INVOKE<void> expressions.
template<typename _Result, typename _Ret>
@ -2833,7 +2831,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/* is_void<_Ret> = */ true,
__void_t<typename _Result::type>>
: true_type
{ };
{
using __nothrow_type = true_type; // For is_nothrow_invocable_r
};
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
@ -2845,23 +2845,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
private:
// The type of the INVOKE expression.
// Unlike declval, this doesn't add_rvalue_reference.
static typename _Result::type _S_get();
// Unlike declval, this doesn't add_rvalue_reference, so it respects
// guaranteed copy elision.
static typename _Result::type _S_get() noexcept;
template<typename _Tp>
static void _S_conv(_Tp);
static void _S_conv(_Tp) noexcept;
// This overload is viable if INVOKE(f, args...) can convert to _Tp.
template<typename _Tp, typename = decltype(_S_conv<_Tp>(_S_get()))>
static true_type
template<typename _Tp, bool _Check_Noex = false,
typename = decltype(_S_conv<_Tp>(_S_get())),
bool _Noex = noexcept(_S_conv<_Tp>(_S_get()))>
static __bool_constant<_Check_Noex ? _Noex : true>
_S_test(int);
template<typename _Tp>
template<typename _Tp, bool = false>
static false_type
_S_test(...);
public:
// For is_invocable_r
using type = decltype(_S_test<_Ret>(1));
// For is_nothrow_invocable_r
using __nothrow_type = decltype(_S_test<_Ret, true>(1));
};
#pragma GCC diagnostic pop
@ -2992,15 +2999,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
};
/// @cond undocumented
template<typename _Result, typename _Ret, typename = void>
struct __is_nt_invocable_impl : false_type { };
template<typename _Result, typename _Ret>
struct __is_nt_invocable_impl<_Result, _Ret,
__void_t<typename _Result::type>>
: __or_<is_void<_Ret>,
__is_nothrow_convertible_lib<typename _Result::type, _Ret>>::type
{ };
using __is_nt_invocable_impl
= typename __is_invocable_impl<_Result, _Ret>::__nothrow_type;
/// @endcond
/// std::is_nothrow_invocable_r

View file

@ -21,9 +21,7 @@
#include <type_traits>
#include <testsuite_tr1.h>
#ifndef IS_NT_CONVERTIBLE_DEFINED
using std::is_nothrow_convertible;
#endif
void test01()
{

View file

@ -15,14 +15,21 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-do compile { target c++11 } }
// { dg-do compile { target c++17 } }
// PR 91456
// std::function and std::is_invocable_r do not understand guaranteed elision
#include <type_traits>
// Test the non-standard __is_nothrow_convertible_lib trait
#include <functional>
template<typename From, typename To>
using is_nothrow_convertible = std::__is_nothrow_convertible_lib<From, To>;
struct Immovable {
Immovable() = default;
Immovable(const Immovable&) = delete;
Immovable& operator=(const Immovable&) = delete;
};
#define IS_NT_CONVERTIBLE_DEFINED
#include "value.cc"
static_assert(std::is_nothrow_invocable_r_v<Immovable, Immovable(*)() noexcept>);
static_assert(std::is_nothrow_invocable_r_v<const Immovable, Immovable(*)() noexcept>);
static_assert(std::is_nothrow_invocable_r_v<Immovable, const Immovable(*)() noexcept>);