mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-01 06:25:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: assert that type traits are not misused with incomplete types [PR 71579]

Browse Source 
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.
This commit is contained in:
Antony Polukhin 2020-09-24 18:51:37 +01:00 committed by Jonathan Wakely
parent 42907ca9a4
commit c1fc9f6e10
6 changed files with 251 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libstdc++-v3/include/std/type_traits
View File

@ -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<typename _Result, typename _Ret, typename = void>
@ -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

47
libstdc++-v3/testsuite/20_util/invoke_result/incomplete_args_neg.cc Normal file
View File

@ -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
// <http://www.gnu.org/licenses/>.
// { dg-error "must be a complete class" "" { target *-*-* } 0 }
#include <type_traits>
class X;
void test01()
{
std::invoke_result<int(X), X>(); // { dg-error "required from here" }
std::invoke_result<int(int, X), int, X>(); // { dg-error "required from here" }
std::invoke_result<int(int, X), X, int>(); // { dg-error "required from here" }
std::invoke_result<int(X&), X&>(); // { dg-bogus "required from here" }
std::invoke_result<int(int, X&), int, X&>(); // { dg-bogus "required from here" }
std::invoke_result<int(X&&), X&&>(); // { dg-bogus "required from here" }
std::invoke_result<int(int, X&&), int, X&&>(); // { dg-bogus "required from here" }
std::invoke_result<int(const X&&), const X&&>(); // { dg-bogus "required from here" }
std::invoke_result<int(int, const X&&), int, const X&&>(); // { dg-bogus "required from here" }
std::invoke_result<int(const X&), const X&>(); // { dg-bogus "required from here" }
std::invoke_result<int(int, const X&), int, const X&>(); // { dg-bogus "required from here" }
std::invoke_result<int(const X&), X&>(); // { dg-bogus "required from here" }
std::invoke_result<int(int, const X&), int, X&>(); // { dg-bogus "required from here" }
}

70
libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc Normal file
View File

@ -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
// <http://www.gnu.org/licenses/>.
// { dg-error "must be a complete class" "" { target *-*-* } 0 }
#include <type_traits>
class X;
void test01()
{
std::is_invocable<int(X), X>(); // { dg-error "required from here" }
std::is_invocable<int(int, X), int, X>(); // { dg-error "required from here" }
std::is_invocable<int(int, X), X, int>(); // { dg-error "required from here" }
std::is_invocable<int(X&), X&>(); // { dg-bogus "required from here" }
std::is_invocable<int(int, X&), int, X&>(); // { dg-bogus "required from here" }
std::is_invocable<int(X&&), X&&>(); // { dg-bogus "required from here" }
std::is_invocable<int(int, X&&), int, X&&>(); // { dg-bogus "required from here" }
std::is_invocable<int(const X&&), const X&&>(); // { dg-bogus "required from here" }
std::is_invocable<int(int, const X&&), int, const X&&>(); // { dg-bogus "required from here" }
std::is_invocable<int(const X&), const X&>(); // { dg-bogus "required from here" }
std::is_invocable<int(int, const X&), int, const X&>(); // { dg-bogus "required from here" }
std::is_invocable<int(const X&), X&>(); // { dg-bogus "required from here" }
std::is_invocable<int(int, const X&), int, X&>(); // { dg-bogus "required from here" }
}
void test02()
{
std::is_invocable_r<int, int(X), X>(); // { dg-error "required from here" }
std::is_invocable_r<int, int(int, X), int, X>(); // { dg-error "required from here" }
std::is_invocable_r<int, int(int, X), X, int>(); // { dg-error "required from here" }
std::is_invocable_r<int, int(X&), X&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(int, X&), int, X&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(X&&), X&&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(int, X&&), int, X&&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(const X&&), const X&&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(int, const X&&), int, const X&&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(const X&), const X&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(int, const X&), int, const X&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(const X&), X&>(); // { dg-bogus "required from here" }
std::is_invocable_r<int, int(int, const X&), int, X&>(); // { dg-bogus "required from here" }
}

39
libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc Normal file
View File

@ -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
// <http://www.gnu.org/licenses/>.
// { dg-error "must be a complete class" "" { target *-*-* } 0 }
#include <type_traits>
class X;
void test01()
{
std::is_invocable<X, int>(); // { dg-error "required from here" }
std::is_invocable<X>(); // { dg-error "required from here" }
std::is_invocable_r<int, X, int>(); // { dg-error "required from here" }
std::is_invocable_r<int, X>(); // { dg-error "required from here" }
std::is_invocable_r<X, X()>(); // { dg-error "required from here" }
std::is_invocable_r<X, X(int), int>(); // { dg-error "required from here" }
std::is_invocable_r<X, X(int, int), int, int>(); // { dg-error "required from here" }
std::is_invocable_r<X, X(), int, int>(); // { dg-error "required from here" }
}

70
libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc Normal file
View File

@ -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
// <http://www.gnu.org/licenses/>.
// { dg-error "must be a complete class" "" { target *-*-* } 0 }
#include <type_traits>
class X;
void test01()
{
std::is_nothrow_invocable<int(X), X>(); // { dg-error "required from here" }
std::is_nothrow_invocable<int(int, X), int, X>(); // { dg-error "required from here" }
std::is_nothrow_invocable<int(int, X), X, int>(); // { dg-error "required from here" }
std::is_nothrow_invocable<int(X&), X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(int, X&), int, X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(X&&), X&&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(int, X&&), int, X&&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(const X&&), const X&&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(int, const X&&), int, const X&&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(const X&), const X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(int, const X&), int, const X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(const X&), X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable<int(int, const X&), int, X&>(); // { dg-bogus "required from here" }
}
void test02()
{
std::is_nothrow_invocable_r<int, int(X), X>(); // { dg-error "required from here" }
std::is_nothrow_invocable_r<int, int(int, X), int, X>(); // { dg-error "required from here" }
std::is_nothrow_invocable_r<int, int(int, X), X, int>(); // { dg-error "required from here" }
std::is_nothrow_invocable_r<int, int(X&), X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(int, X&), int, X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(X&&), X&&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(int, X&&), int, X&&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(const X&&), const X&&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(int, const X&&), int, const X&&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(const X&), const X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(int, const X&), int, const X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(const X&), X&>(); // { dg-bogus "required from here" }
std::is_nothrow_invocable_r<int, int(int, const X&), int, X&>(); // { dg-bogus "required from here" }
}

6
libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc
View File

@ -30,4 +30,10 @@ void test01()
std::is_nothrow_invocable_r<int, X>(); // { dg-error "required from here" }
std::is_nothrow_invocable_r<int, X, short>(); // { dg-error "required from here" }
std::is_nothrow_invocable_r<X, X()>(); // { dg-error "required from here" }
std::is_nothrow_invocable_r<X, X(int), int>(); // { dg-error "required from here" }
std::is_nothrow_invocable_r<X, X(int, int), int, int>(); // { dg-error "required from here" }
std::is_nothrow_invocable_r<X, X(), int, int>(); // { dg-error "required from here" }
}