From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4E55C3857C52; Thu, 24 Sep 2020 17:51:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4E55C3857C52 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-3442] libstdc++: assert that type traits are not misused with incomplete types [PR 71579] X-Act-Checkin: gcc X-Git-Author: Antony Polukhin X-Git-Refname: refs/heads/master X-Git-Oldrev: 42907ca9a495a4a535bbd995fa126afb76012023 X-Git-Newrev: c1fc9f6e10e646f01194c8f150affbc1cfbc404a Message-Id: <20200924175143.4E55C3857C52@sourceware.org> Date: Thu, 24 Sep 2020 17:51:43 +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, 24 Sep 2020 17:51:43 -0000 https://gcc.gnu.org/g:c1fc9f6e10e646f01194c8f150affbc1cfbc404a commit r11-3442-gc1fc9f6e10e646f01194c8f150affbc1cfbc404a Author: Antony Polukhin Date: Thu Sep 24 18:51:37 2020 +0100 libstdc++: assert that type traits are not misused with incomplete types [PR 71579] libstdc++-v3/ChangeLog: PR libstdc++/71579 * include/std/type_traits (invoke_result, is_invocable) (is_invocable_r, is_nothrow_invocable, is_nothrow_invocable_r): Add static_asserts to make sure that the arguments of the type traits are not misused with incomplete types. * testsuite/20_util/invoke_result/incomplete_args_neg.cc: New test. * testsuite/20_util/is_invocable/incomplete_args_neg.cc: New test. * testsuite/20_util/is_invocable/incomplete_neg.cc: New test. * testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc: New test. * testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc: Check for error on incomplete type usage in trait. Diff: --- libstdc++-v3/include/std/type_traits | 19 ++++++ .../20_util/invoke_result/incomplete_args_neg.cc | 47 +++++++++++++++ .../20_util/is_invocable/incomplete_args_neg.cc | 70 ++++++++++++++++++++++ .../20_util/is_invocable/incomplete_neg.cc | 39 ++++++++++++ .../is_nothrow_invocable/incomplete_args_neg.cc | 70 ++++++++++++++++++++++ .../20_util/is_nothrow_invocable/incomplete_neg.cc | 6 ++ 6 files changed, 251 insertions(+) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 6ced781bd59..b7bb63bbc74 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -2965,6 +2965,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { static_assert(std::__is_complete_or_unbounded(__type_identity<_Functor>{}), "_Functor must be a complete class or an unbounded array"); + static_assert((std::__is_complete_or_unbounded( + __type_identity<_ArgTypes>{}) && ...), + "each argument type must be a complete class or an unbounded array"); }; /// std::invoke_result_t @@ -2978,6 +2981,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { static_assert(std::__is_complete_or_unbounded(__type_identity<_Fn>{}), "_Fn must be a complete class or an unbounded array"); + static_assert((std::__is_complete_or_unbounded( + __type_identity<_ArgTypes>{}) && ...), + "each argument type must be a complete class or an unbounded array"); }; /// std::is_invocable_r @@ -2987,6 +2993,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { static_assert(std::__is_complete_or_unbounded(__type_identity<_Fn>{}), "_Fn must be a complete class or an unbounded array"); + static_assert((std::__is_complete_or_unbounded( + __type_identity<_ArgTypes>{}) && ...), + "each argument type must be a complete class or an unbounded array"); + static_assert(std::__is_complete_or_unbounded(__type_identity<_Ret>{}), + "_Ret must be a complete class or an unbounded array"); }; /// std::is_nothrow_invocable @@ -2997,6 +3008,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { static_assert(std::__is_complete_or_unbounded(__type_identity<_Fn>{}), "_Fn must be a complete class or an unbounded array"); + static_assert((std::__is_complete_or_unbounded( + __type_identity<_ArgTypes>{}) && ...), + "each argument type must be a complete class or an unbounded array"); }; template @@ -3017,6 +3031,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { static_assert(std::__is_complete_or_unbounded(__type_identity<_Fn>{}), "_Fn must be a complete class or an unbounded array"); + static_assert((std::__is_complete_or_unbounded( + __type_identity<_ArgTypes>{}) && ...), + "each argument type must be a complete class or an unbounded array"); + static_assert(std::__is_complete_or_unbounded(__type_identity<_Ret>{}), + "_Ret must be a complete class or an unbounded array"); }; /// std::is_invocable_v diff --git a/libstdc++-v3/testsuite/20_util/invoke_result/incomplete_args_neg.cc b/libstdc++-v3/testsuite/20_util/invoke_result/incomplete_args_neg.cc new file mode 100644 index 00000000000..a35ff4cd059 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/invoke_result/incomplete_args_neg.cc @@ -0,0 +1,47 @@ +// { dg-do compile { target c++17 } } + +// Copyright (C) 2020 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-error "must be a complete class" "" { target *-*-* } 0 } + +#include + +class X; + +void test01() +{ + std::invoke_result(); // { dg-error "required from here" } + std::invoke_result(); // { dg-error "required from here" } + std::invoke_result(); // { dg-error "required from here" } + + + std::invoke_result(); // { dg-bogus "required from here" } + std::invoke_result(); // { dg-bogus "required from here" } + + std::invoke_result(); // { dg-bogus "required from here" } + std::invoke_result(); // { dg-bogus "required from here" } + + std::invoke_result(); // { dg-bogus "required from here" } + std::invoke_result(); // { dg-bogus "required from here" } + + std::invoke_result(); // { dg-bogus "required from here" } + std::invoke_result(); // { dg-bogus "required from here" } + + std::invoke_result(); // { dg-bogus "required from here" } + std::invoke_result(); // { dg-bogus "required from here" } +} diff --git a/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc new file mode 100644 index 00000000000..a5ce49a7fc5 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc @@ -0,0 +1,70 @@ +// { dg-do compile { target c++17 } } + +// Copyright (C) 2020 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-error "must be a complete class" "" { target *-*-* } 0 } + +#include + +class X; + +void test01() +{ + std::is_invocable(); // { dg-error "required from here" } + std::is_invocable(); // { dg-error "required from here" } + std::is_invocable(); // { dg-error "required from here" } + + + std::is_invocable(); // { dg-bogus "required from here" } + std::is_invocable(); // { dg-bogus "required from here" } + + std::is_invocable(); // { dg-bogus "required from here" } + std::is_invocable(); // { dg-bogus "required from here" } + + std::is_invocable(); // { dg-bogus "required from here" } + std::is_invocable(); // { dg-bogus "required from here" } + + std::is_invocable(); // { dg-bogus "required from here" } + std::is_invocable(); // { dg-bogus "required from here" } + + std::is_invocable(); // { dg-bogus "required from here" } + std::is_invocable(); // { dg-bogus "required from here" } +} + +void test02() +{ + std::is_invocable_r(); // { dg-error "required from here" } + std::is_invocable_r(); // { dg-error "required from here" } + std::is_invocable_r(); // { dg-error "required from here" } + + + std::is_invocable_r(); // { dg-bogus "required from here" } + std::is_invocable_r(); // { dg-bogus "required from here" } + + std::is_invocable_r(); // { dg-bogus "required from here" } + std::is_invocable_r(); // { dg-bogus "required from here" } + + std::is_invocable_r(); // { dg-bogus "required from here" } + std::is_invocable_r(); // { dg-bogus "required from here" } + + std::is_invocable_r(); // { dg-bogus "required from here" } + std::is_invocable_r(); // { dg-bogus "required from here" } + + std::is_invocable_r(); // { dg-bogus "required from here" } + std::is_invocable_r(); // { dg-bogus "required from here" } +} diff --git a/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc new file mode 100644 index 00000000000..3041554b62a --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc @@ -0,0 +1,39 @@ +// { dg-do compile { target c++17 } } + +// Copyright (C) 2020 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-error "must be a complete class" "" { target *-*-* } 0 } + +#include + +class X; + +void test01() +{ + std::is_invocable(); // { dg-error "required from here" } + std::is_invocable(); // { dg-error "required from here" } + + std::is_invocable_r(); // { dg-error "required from here" } + std::is_invocable_r(); // { dg-error "required from here" } + + std::is_invocable_r(); // { dg-error "required from here" } + std::is_invocable_r(); // { dg-error "required from here" } + std::is_invocable_r(); // { dg-error "required from here" } + + std::is_invocable_r(); // { dg-error "required from here" } +} diff --git a/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc new file mode 100644 index 00000000000..c60e73b8ec2 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc @@ -0,0 +1,70 @@ +// { dg-do compile { target c++17 } } + +// Copyright (C) 2020 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-error "must be a complete class" "" { target *-*-* } 0 } + +#include + +class X; + +void test01() +{ + std::is_nothrow_invocable(); // { dg-error "required from here" } + std::is_nothrow_invocable(); // { dg-error "required from here" } + std::is_nothrow_invocable(); // { dg-error "required from here" } + + + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + + std::is_nothrow_invocable(); // { dg-bogus "required from here" } + std::is_nothrow_invocable(); // { dg-bogus "required from here" } +} + +void test02() +{ + std::is_nothrow_invocable_r(); // { dg-error "required from here" } + std::is_nothrow_invocable_r(); // { dg-error "required from here" } + std::is_nothrow_invocable_r(); // { dg-error "required from here" } + + + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } + std::is_nothrow_invocable_r(); // { dg-bogus "required from here" } +} diff --git a/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc index ad16809027a..ef8717185cc 100644 --- a/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc +++ b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc @@ -30,4 +30,10 @@ void test01() std::is_nothrow_invocable_r(); // { dg-error "required from here" } std::is_nothrow_invocable_r(); // { dg-error "required from here" } + + std::is_nothrow_invocable_r(); // { dg-error "required from here" } + std::is_nothrow_invocable_r(); // { dg-error "required from here" } + std::is_nothrow_invocable_r(); // { dg-error "required from here" } + + std::is_nothrow_invocable_r(); // { dg-error "required from here" } }