FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: Implement __is_member_object_pointer built-in trait

Browse source 
This patch implements built-in trait for std::is_member_object_pointer.

gcc/cp/ChangeLog:

	* cp-trait.def: Define __is_member_object_pointer.
	* constraint.cc (diagnose_trait_expr): Handle
	CPTK_IS_MEMBER_OBJECT_POINTER.
	* semantics.cc (trait_expr_value): Likewise.
	(finish_trait_expr): Likewise.

gcc/testsuite/ChangeLog:

	* g++.dg/ext/has-builtin-1.C: Test existence of
	__is_member_object_pointer.
	* g++.dg/ext/is_member_object_pointer.C: New test.

Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
This commit is contained in:
Ken Matsui 2023-12-06 21:33:09 -08:00 • committed by Jason Merrill
parent 7c62a418f8
commit f4007cb78e
5 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/constraint.cc
View file

@ -3761,6 +3761,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_MEMBER_FUNCTION_POINTER:
inform (loc, " %qT is not a member function pointer", t1);
break;
case CPTK_IS_MEMBER_OBJECT_POINTER:
inform (loc, " %qT is not a member object pointer", t1);
break;
case CPTK_IS_MEMBER_POINTER:
inform (loc, " %qT is not a member pointer", t1);
break;

1
gcc/cp/cp-trait.def
View file

@ -72,6 +72,7 @@ DEFTRAIT_EXPR (IS_FINAL, "__is_final", 1)
DEFTRAIT_EXPR (IS_LAYOUT_COMPATIBLE, "__is_layout_compatible", 2)
DEFTRAIT_EXPR (IS_LITERAL_TYPE, "__is_literal_type", 1)
DEFTRAIT_EXPR (IS_MEMBER_FUNCTION_POINTER, "__is_member_function_pointer", 1)
DEFTRAIT_EXPR (IS_MEMBER_OBJECT_POINTER, "__is_member_object_pointer", 1)
DEFTRAIT_EXPR (IS_MEMBER_POINTER, "__is_member_pointer", 1)
DEFTRAIT_EXPR (IS_NOTHROW_ASSIGNABLE, "__is_nothrow_assignable", 2)
DEFTRAIT_EXPR (IS_NOTHROW_CONSTRUCTIBLE, "__is_nothrow_constructible", -1)

4
gcc/cp/semantics.cc
View file

@ -12428,6 +12428,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_MEMBER_FUNCTION_POINTER:
return TYPE_PTRMEMFUNC_P (type1);
case CPTK_IS_MEMBER_OBJECT_POINTER:
return TYPE_PTRDATAMEM_P (type1);
case CPTK_IS_MEMBER_POINTER:
return TYPE_PTRMEM_P (type1);
@ -12634,6 +12637,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_CLASS:
case CPTK_IS_ENUM:
case CPTK_IS_MEMBER_FUNCTION_POINTER:
case CPTK_IS_MEMBER_OBJECT_POINTER:
case CPTK_IS_MEMBER_POINTER:
case CPTK_IS_SAME:
case CPTK_IS_SCOPED_ENUM:

3
gcc/testsuite/g++.dg/ext/has-builtin-1.C
View file

@ -95,6 +95,9 @@
#if !__has_builtin (__is_member_function_pointer)
# error "__has_builtin (__is_member_function_pointer) failed"
#endif
#if !__has_builtin (__is_member_object_pointer)
# error "__has_builtin (__is_member_object_pointer) failed"
#endif
#if !__has_builtin (__is_member_pointer)
# error "__has_builtin (__is_member_pointer) failed"
#endif

30
gcc/testsuite/g++.dg/ext/is_member_object_pointer.C Normal file
View file

@ -0,0 +1,30 @@
// { dg-do compile { target c++11 } }
#include <testsuite_tr1.h>
using namespace __gnu_test;
#define SA(X) static_assert((X),#X)
#define SA_TEST_NON_VOLATILE(TRAIT, TYPE, EXPECT) \
SA(TRAIT(TYPE) == EXPECT); \
SA(TRAIT(const TYPE) == EXPECT)
#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
SA(TRAIT(TYPE) == EXPECT); \
SA(TRAIT(const TYPE) == EXPECT); \
SA(TRAIT(volatile TYPE) == EXPECT); \
SA(TRAIT(const volatile TYPE) == EXPECT)
// Positive tests.
SA_TEST_CATEGORY(__is_member_object_pointer, int (ClassType::*), true);
SA_TEST_CATEGORY(__is_member_object_pointer, ClassType (ClassType::*), true);
// Negative tests.
SA_TEST_NON_VOLATILE(__is_member_object_pointer, int (ClassType::*) (int), false);
SA_TEST_NON_VOLATILE(__is_member_object_pointer, int (ClassType::*) (float, ...), false);
SA_TEST_NON_VOLATILE(__is_member_object_pointer, ClassType (ClassType::*) (ClassType), false);
SA_TEST_NON_VOLATILE(__is_member_object_pointer, float (ClassType::*) (int, float, int[], int&), false);
// Sanity check.
SA_TEST_CATEGORY(__is_member_object_pointer, ClassType, false);