From 91d01b33e8c331d594b40f464b2af44c8aeac597 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 12 Dec 2017 17:42:19 +0000 Subject: [PATCH] PR libstdc++/83395 fix invocable traits for INVOKE PR libstdc++/83395 * include/std/type_traits (__is_invocable_impl): Remove partial specialization for INVOKE and restore is_void check in primary template. (__is_nt_invocable_impl): Likewise. * testsuite/20_util/is_invocable/83395.cc: New test. * testsuite/20_util/is_nothrow_invocable/83395.cc: New test. From-SVN: r255584 --- libstdc++-v3/ChangeLog | 10 ++++++++ libstdc++-v3/include/std/type_traits | 18 ++++---------- .../testsuite/20_util/is_invocable/83395.cc | 28 ++++++++++++++++++++++ .../20_util/is_nothrow_invocable/83395.cc | 28 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/is_invocable/83395.cc create mode 100644 libstdc++-v3/testsuite/20_util/is_nothrow_invocable/83395.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3043c25..c8c9335 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2017-12-12 Jonathan Wakely + + PR libstdc++/83395 + * include/std/type_traits (__is_invocable_impl): Remove partial + specialization for INVOKE and restore is_void check in + primary template. + (__is_nt_invocable_impl): Likewise. + * testsuite/20_util/is_invocable/83395.cc: New test. + * testsuite/20_util/is_nothrow_invocable/83395.cc: New test. + 2017-12-07 David Edelsohn PR libstdc++/83120 diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 1d639e4..3d94566 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -2589,12 +2589,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template struct __is_invocable_impl<_Result, _Ret, __void_t> - : is_convertible::type - { }; - - template - struct __is_invocable_impl<_Result, void, __void_t> - : true_type + : __or_, is_convertible>::type { }; template @@ -2699,14 +2694,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template struct __is_nt_invocable_impl<_Result, _Ret, __void_t> - : __and_, - is_nothrow_constructible<_Ret, typename _Result::type>> - { }; - - template - struct __is_nt_invocable_impl<_Result, void, - __void_t> - : true_type + : __or_, + __and_, + is_nothrow_constructible<_Ret, typename _Result::type>>> { }; /// std::is_nothrow_invocable_r diff --git a/libstdc++-v3/testsuite/20_util/is_invocable/83395.cc b/libstdc++-v3/testsuite/20_util/is_invocable/83395.cc new file mode 100644 index 0000000..7fb1368 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_invocable/83395.cc @@ -0,0 +1,28 @@ +// Copyright (C) 2017 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include + +// PR libstdc++/83395 +using F = int(*)(); +static_assert(std::is_invocable_r::value); +static_assert(std::is_invocable_r::value); +static_assert(std::is_invocable_r::value); +static_assert(std::is_invocable_r::value); diff --git a/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/83395.cc b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/83395.cc new file mode 100644 index 0000000..2a253df --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/83395.cc @@ -0,0 +1,28 @@ +// Copyright (C) 2017 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include + +// PR libstdc++/83395 +using F = int(*)() noexcept; +static_assert(std::is_nothrow_invocable_r::value); +static_assert(std::is_nothrow_invocable_r::value); +static_assert(std::is_nothrow_invocable_r::value); +static_assert(std::is_nothrow_invocable_r::value); -- 2.7.4