@@ -3787,6 +3787,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_POD:
inform (loc, " %qT is not a POD type", t1);
break;
+ case CPTK_IS_POINTER:
+ inform (loc, " %qT is not a pointer", t1);
+ break;
case CPTK_IS_POLYMORPHIC:
inform (loc, " %qT is not a polymorphic type", t1);
break;
@@ -81,6 +81,7 @@ DEFTRAIT_EXPR (IS_NOTHROW_CONSTRUCTIBLE, "__is_nothrow_constructible", -1)
DEFTRAIT_EXPR (IS_NOTHROW_CONVERTIBLE, "__is_nothrow_convertible", 2)
DEFTRAIT_EXPR (IS_POINTER_INTERCONVERTIBLE_BASE_OF, "__is_pointer_interconvertible_base_of", 2)
DEFTRAIT_EXPR (IS_POD, "__is_pod", 1)
+DEFTRAIT_EXPR (IS_POINTER, "__is_pointer", 1)
DEFTRAIT_EXPR (IS_POLYMORPHIC, "__is_polymorphic", 1)
DEFTRAIT_EXPR (IS_REFERENCE, "__is_reference", 1)
DEFTRAIT_EXPR (IS_SAME, "__is_same", 2)
@@ -61,6 +61,7 @@ struct cp_trait {
"__is_nothrow_convertible", CPTK_IS_NOTHROW_CONVERTIBLE, 2, false
"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERCONVERTIBLE_BASE_OF, 2, false
"__is_pod", CPTK_IS_POD, 1, false
+"__is_pointer", CPTK_IS_POINTER, 1, false
"__is_polymorphic", CPTK_IS_POLYMORPHIC, 1, false
"__is_reference", CPTK_IS_REFERENCE, 1, false
"__is_same", CPTK_IS_SAME, 2, false
@@ -54,7 +54,7 @@ struct cp_trait {
short arity;
bool type;
};
-/* maximum key range = 109, duplicates = 0 */
+/* maximum key range = 92, duplicates = 0 */
class cp_trait_lookup
{
@@ -69,32 +69,32 @@ cp_trait_lookup::hash (const char *str, size_t len)
{
static const unsigned char asso_values[] =
{
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 20, 116, 40, 5, 40,
- 50, 0, 55, 10, 116, 0, 116, 116, 5, 25,
- 30, 0, 5, 116, 10, 15, 5, 0, 25, 116,
- 116, 20, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 20, 99, 40, 45, 40,
+ 5, 0, 55, 10, 99, 0, 99, 99, 10, 25,
+ 30, 0, 10, 99, 10, 15, 5, 0, 20, 99,
+ 99, 10, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99
};
unsigned int hval = len;
@@ -116,78 +116,78 @@ cp_trait_lookup::find (const char *str, size_t len)
{
enum
{
- TOTAL_KEYWORDS = 57,
+ TOTAL_KEYWORDS = 58,
MIN_WORD_LENGTH = 7,
MAX_WORD_LENGTH = 37,
MIN_HASH_VALUE = 7,
- MAX_HASH_VALUE = 115
+ MAX_HASH_VALUE = 98
};
static const struct cp_trait wordlist[] =
{
-#line 85 "../../gcc/cp/cp-trait.gperf"
+#line 86 "../../gcc/cp/cp-trait.gperf"
{"__bases", CPTK_BASES, 1, true},
#line 51 "../../gcc/cp/cp-trait.gperf"
{"__is_enum", CPTK_IS_ENUM, 1, false},
-#line 74 "../../gcc/cp/cp-trait.gperf"
+#line 75 "../../gcc/cp/cp-trait.gperf"
{"__is_union", CPTK_IS_UNION, 1, false},
-#line 78 "../../gcc/cp/cp-trait.gperf"
- {"__remove_cv", CPTK_REMOVE_CV, 1, true},
#line 79 "../../gcc/cp/cp-trait.gperf"
- {"__remove_cvref", CPTK_REMOVE_CVREF, 1, true},
-#line 50 "../../gcc/cp/cp-trait.gperf"
- {"__is_empty", CPTK_IS_EMPTY, 1, false},
+ {"__remove_cv", CPTK_REMOVE_CV, 1, true},
#line 80 "../../gcc/cp/cp-trait.gperf"
+ {"__remove_cvref", CPTK_REMOVE_CVREF, 1, true},
+#line 81 "../../gcc/cp/cp-trait.gperf"
{"__remove_pointer", CPTK_REMOVE_POINTER, 1, true},
-#line 69 "../../gcc/cp/cp-trait.gperf"
+#line 70 "../../gcc/cp/cp-trait.gperf"
{"__is_trivial", CPTK_IS_TRIVIAL, 1, false},
-#line 81 "../../gcc/cp/cp-trait.gperf"
+#line 82 "../../gcc/cp/cp-trait.gperf"
{"__remove_reference", CPTK_REMOVE_REFERENCE, 1, true},
-#line 86 "../../gcc/cp/cp-trait.gperf"
+#line 87 "../../gcc/cp/cp-trait.gperf"
{"__direct_bases", CPTK_DIRECT_BASES, 1, true},
-#line 83 "../../gcc/cp/cp-trait.gperf"
+#line 50 "../../gcc/cp/cp-trait.gperf"
+ {"__is_empty", CPTK_IS_EMPTY, 1, false},
+#line 64 "../../gcc/cp/cp-trait.gperf"
+ {"__is_pointer", CPTK_IS_POINTER, 1, false},
+#line 63 "../../gcc/cp/cp-trait.gperf"
+ {"__is_pod", CPTK_IS_POD, 1, false},
+#line 85 "../../gcc/cp/cp-trait.gperf"
+ {"__is_deducible ", CPTK_IS_DEDUCIBLE, 2, false},
+#line 84 "../../gcc/cp/cp-trait.gperf"
{"__underlying_type", CPTK_UNDERLYING_TYPE, 1, true},
-#line 45 "../../gcc/cp/cp-trait.gperf"
- {"__is_bounded_array", CPTK_IS_BOUNDED_ARRAY, 1, false},
-#line 82 "../../gcc/cp/cp-trait.gperf"
- {"__type_pack_element", CPTK_TYPE_PACK_ELEMENT, -1, true},
#line 73 "../../gcc/cp/cp-trait.gperf"
- {"__is_unbounded_array", CPTK_IS_UNBOUNDED_ARRAY, 1, false},
-#line 64 "../../gcc/cp/cp-trait.gperf"
- {"__is_polymorphic", CPTK_IS_POLYMORPHIC, 1, false},
-#line 55 "../../gcc/cp/cp-trait.gperf"
- {"__is_literal_type", CPTK_IS_LITERAL_TYPE, 1, false},
-#line 72 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_copyable", CPTK_IS_TRIVIALLY_COPYABLE, 1, false},
-#line 70 "../../gcc/cp/cp-trait.gperf"
+#line 83 "../../gcc/cp/cp-trait.gperf"
+ {"__type_pack_element", CPTK_TYPE_PACK_ELEMENT, -1, true},
+#line 71 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_assignable", CPTK_IS_TRIVIALLY_ASSIGNABLE, 2, false},
-#line 67 "../../gcc/cp/cp-trait.gperf"
+#line 68 "../../gcc/cp/cp-trait.gperf"
{"__is_scoped_enum", CPTK_IS_SCOPED_ENUM, 1, false},
-#line 44 "../../gcc/cp/cp-trait.gperf"
- {"__is_base_of", CPTK_IS_BASE_OF, 2, false},
-#line 71 "../../gcc/cp/cp-trait.gperf"
+#line 55 "../../gcc/cp/cp-trait.gperf"
+ {"__is_literal_type", CPTK_IS_LITERAL_TYPE, 1, false},
+#line 72 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_constructible", CPTK_IS_TRIVIALLY_CONSTRUCTIBLE, -1, false},
-#line 77 "../../gcc/cp/cp-trait.gperf"
+#line 78 "../../gcc/cp/cp-trait.gperf"
{"__reference_converts_from_temporary", CPTK_REF_CONVERTS_FROM_TEMPORARY, 2, false},
-#line 76 "../../gcc/cp/cp-trait.gperf"
+#line 65 "../../gcc/cp/cp-trait.gperf"
+ {"__is_polymorphic", CPTK_IS_POLYMORPHIC, 1, false},
+#line 77 "../../gcc/cp/cp-trait.gperf"
{"__reference_constructs_from_temporary", CPTK_REF_CONSTRUCTS_FROM_TEMPORARY, 2, false},
#line 33 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_copy", CPTK_HAS_NOTHROW_COPY, 1, false},
#line 31 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_assign", CPTK_HAS_NOTHROW_ASSIGN, 1, false},
-#line 62 "../../gcc/cp/cp-trait.gperf"
- {"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERCONVERTIBLE_BASE_OF, 2, false},
-#line 75 "../../gcc/cp/cp-trait.gperf"
+#line 54 "../../gcc/cp/cp-trait.gperf"
+ {"__is_layout_compatible", CPTK_IS_LAYOUT_COMPATIBLE, 2, false},
+#line 76 "../../gcc/cp/cp-trait.gperf"
{"__is_volatile", CPTK_IS_VOLATILE, 1, false},
#line 39 "../../gcc/cp/cp-trait.gperf"
{"__has_virtual_destructor", CPTK_HAS_VIRTUAL_DESTRUCTOR, 1, false},
#line 32 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_constructor", CPTK_HAS_NOTHROW_CONSTRUCTOR, 1, false},
-#line 54 "../../gcc/cp/cp-trait.gperf"
- {"__is_layout_compatible", CPTK_IS_LAYOUT_COMPATIBLE, 2, false},
+#line 62 "../../gcc/cp/cp-trait.gperf"
+ {"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERCONVERTIBLE_BASE_OF, 2, false},
#line 36 "../../gcc/cp/cp-trait.gperf"
{"__has_trivial_copy", CPTK_HAS_TRIVIAL_COPY, 1, false},
-#line 66 "../../gcc/cp/cp-trait.gperf"
+#line 67 "../../gcc/cp/cp-trait.gperf"
{"__is_same", CPTK_IS_SAME, 2, false},
#line 34 "../../gcc/cp/cp-trait.gperf"
{"__has_trivial_assign", CPTK_HAS_TRIVIAL_ASSIGN, 1, false},
@@ -205,23 +205,27 @@ cp_trait_lookup::find (const char *str, size_t len)
{"__is_array", CPTK_IS_ARRAY, 1, false},
#line 60 "../../gcc/cp/cp-trait.gperf"
{"__is_nothrow_constructible", CPTK_IS_NOTHROW_CONSTRUCTIBLE, -1, false},
-#line 63 "../../gcc/cp/cp-trait.gperf"
- {"__is_pod", CPTK_IS_POD, 1, false},
+#line 45 "../../gcc/cp/cp-trait.gperf"
+ {"__is_bounded_array", CPTK_IS_BOUNDED_ARRAY, 1, false},
#line 41 "../../gcc/cp/cp-trait.gperf"
{"__is_aggregate", CPTK_IS_AGGREGATE, 1, false},
+#line 74 "../../gcc/cp/cp-trait.gperf"
+ {"__is_unbounded_array", CPTK_IS_UNBOUNDED_ARRAY, 1, false},
#line 40 "../../gcc/cp/cp-trait.gperf"
{"__is_abstract", CPTK_IS_ABSTRACT, 1, false},
#line 58 "../../gcc/cp/cp-trait.gperf"
{"__is_member_pointer", CPTK_IS_MEMBER_POINTER, 1, false},
#line 43 "../../gcc/cp/cp-trait.gperf"
{"__is_assignable", CPTK_IS_ASSIGNABLE, 2, false},
-#line 68 "../../gcc/cp/cp-trait.gperf"
+#line 44 "../../gcc/cp/cp-trait.gperf"
+ {"__is_base_of", CPTK_IS_BASE_OF, 2, false},
+#line 69 "../../gcc/cp/cp-trait.gperf"
{"__is_standard_layout", CPTK_IS_STD_LAYOUT, 1, false},
#line 57 "../../gcc/cp/cp-trait.gperf"
{"__is_member_object_pointer", CPTK_IS_MEMBER_OBJECT_POINTER, 1, false},
#line 56 "../../gcc/cp/cp-trait.gperf"
{"__is_member_function_pointer", CPTK_IS_MEMBER_FUNCTION_POINTER, 1, false},
-#line 65 "../../gcc/cp/cp-trait.gperf"
+#line 66 "../../gcc/cp/cp-trait.gperf"
{"__is_reference", CPTK_IS_REFERENCE, 1, false},
#line 47 "../../gcc/cp/cp-trait.gperf"
{"__is_const", CPTK_IS_CONST, 1, false},
@@ -236,22 +240,19 @@ cp_trait_lookup::find (const char *str, size_t len)
#line 52 "../../gcc/cp/cp-trait.gperf"
{"__is_final", CPTK_IS_FINAL, 1, false},
#line 53 "../../gcc/cp/cp-trait.gperf"
- {"__is_function", CPTK_IS_FUNCTION, 1, false},
-#line 84 "../../gcc/cp/cp-trait.gperf"
- {"__is_deducible ", CPTK_IS_DEDUCIBLE, 2, false}
+ {"__is_function", CPTK_IS_FUNCTION, 1, false}
};
static const signed char lookup[] =
{
-1, -1, -1, -1, -1, -1, -1, 0, -1, 1, 2, 3, -1, -1,
- 4, 5, 6, 7, 8, 9, -1, -1, 10, 11, 12, 13, 14, 15,
- 16, -1, 17, 18, 19, 20, -1, 21, -1, 22, 23, -1, 24, -1,
+ 4, -1, 5, 6, 7, 8, 9, -1, 10, 11, -1, 12, -1, 13,
+ 14, 15, 16, 17, 18, 19, -1, 20, 21, 22, 23, -1, 24, -1,
25, 26, 27, 28, -1, 29, 30, 31, 32, -1, 33, -1, 34, 35,
- -1, -1, 36, 37, 38, 39, -1, 40, 41, -1, -1, -1, 42, 43,
- 44, -1, -1, -1, -1, 45, 46, -1, 47, 48, 49, -1, -1, -1,
- -1, 50, 51, -1, 52, -1, 53, -1, -1, -1, -1, 54, -1, -1,
- 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 56
+ -1, -1, 36, 37, 38, 39, -1, 40, 41, 42, -1, -1, 43, 44,
+ 45, -1, 46, -1, -1, 47, 48, -1, 49, 50, 51, -1, -1, -1,
+ -1, 52, 53, -1, 54, -1, 55, -1, -1, -1, -1, 56, -1, -1,
+ 57
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12211,6 +12211,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_POD:
return pod_type_p (type1);
+ case CPTK_IS_POINTER:
+ return TYPE_PTR_P (type1);
+
case CPTK_IS_POLYMORPHIC:
return CLASS_TYPE_P (type1) && TYPE_POLYMORPHIC_P (type1);
@@ -12412,6 +12415,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_MEMBER_FUNCTION_POINTER:
case CPTK_IS_MEMBER_OBJECT_POINTER:
case CPTK_IS_MEMBER_POINTER:
+ case CPTK_IS_POINTER:
case CPTK_IS_REFERENCE:
case CPTK_IS_SAME:
case CPTK_IS_SCOPED_ENUM:
@@ -122,6 +122,9 @@
#if !__has_builtin (__is_pod)
# error "__has_builtin (__is_pod) failed"
#endif
+#if !__has_builtin (__is_pointer)
+# error "__has_builtin (__is_pointer) failed"
+#endif
#if !__has_builtin (__is_polymorphic)
# error "__has_builtin (__is_polymorphic) failed"
#endif
new file mode 100644
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++11 } }
+
+#define SA(X) static_assert((X),#X)
+
+SA(!__is_pointer(int));
+SA(__is_pointer(int*));
+SA(__is_pointer(int**));
+
+SA(__is_pointer(const int*));
+SA(__is_pointer(const int**));
+SA(__is_pointer(int* const));
+SA(__is_pointer(int** const));
+SA(__is_pointer(int* const* const));
+
+SA(__is_pointer(volatile int*));
+SA(__is_pointer(volatile int**));
+SA(__is_pointer(int* volatile));
+SA(__is_pointer(int** volatile));
+SA(__is_pointer(int* volatile* volatile));
+
+SA(__is_pointer(const volatile int*));
+SA(__is_pointer(const volatile int**));
+SA(__is_pointer(const int* volatile));
+SA(__is_pointer(volatile int* const));
+SA(__is_pointer(int* const volatile));
+SA(__is_pointer(const int** volatile));
+SA(__is_pointer(volatile int** const));
+SA(__is_pointer(int** const volatile));
+SA(__is_pointer(int* const* const volatile));
+SA(__is_pointer(int* volatile* const volatile));
+SA(__is_pointer(int* const volatile* const volatile));
+
+SA(!__is_pointer(int&));
+SA(!__is_pointer(const int&));
+SA(!__is_pointer(volatile int&));
+SA(!__is_pointer(const volatile int&));
+
+SA(!__is_pointer(int&&));
+SA(!__is_pointer(const int&&));
+SA(!__is_pointer(volatile int&&));
+SA(!__is_pointer(const volatile int&&));
+
+SA(!__is_pointer(int[3]));
+SA(!__is_pointer(const int[3]));
+SA(!__is_pointer(volatile int[3]));
+SA(!__is_pointer(const volatile int[3]));
+
+SA(!__is_pointer(int(int)));
+SA(__is_pointer(int(*const)(int)));
+SA(__is_pointer(int(*volatile)(int)));
+SA(__is_pointer(int(*const volatile)(int)));