From: Paolo Carlini Date: Tue, 2 Apr 2013 11:45:31 +0000 (+0000) Subject: cp-tree.h (TAGGED_TYPE_P): Remove. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73243d6301a2bd8a9dcae589d6cfb0a459542a94;p=gcc.git cp-tree.h (TAGGED_TYPE_P): Remove. 2013-04-02 Paolo Carlini * cp-tree.h (TAGGED_TYPE_P): Remove. (IS_OVERLOAD_TYPE): Rename to OVERLOAD_TYPE_P, adjust. (TYPE_ANONYMOUS_P): Adjust. * call.c (build_new_op_1): Likewise. * class.c (find_abi_tags_r): Likewise. * decl.c (warn_misplaced_attr_for_class_type, start_decl, type_is_deprecated): Likewise. * decl2.c (grokfield, min_vis_r): Likewise. * pt.c (get_template_info): Likewise. * tree.c (handle_abi_tag_attribute): Likewise. From-SVN: r197347 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index af719499713..7c9ba7422f4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,16 @@ +2013-04-02 Paolo Carlini + + * cp-tree.h (TAGGED_TYPE_P): Remove. + (IS_OVERLOAD_TYPE): Rename to OVERLOAD_TYPE_P, adjust. + (TYPE_ANONYMOUS_P): Adjust. + * call.c (build_new_op_1): Likewise. + * class.c (find_abi_tags_r): Likewise. + * decl.c (warn_misplaced_attr_for_class_type, start_decl, + type_is_deprecated): Likewise. + * decl2.c (grokfield, min_vis_r): Likewise. + * pt.c (get_template_info): Likewise. + * tree.c (handle_abi_tag_attribute): Likewise. + 2013-04-01 Jason Merrill * semantics.c (maybe_constant_value): Check diff --git a/gcc/cp/call.c b/gcc/cp/call.c index b75ca974e04..9b0cbe4ea5f 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5097,8 +5097,8 @@ build_new_op_1 (location_t loc, enum tree_code code, int flags, tree arg1, if (code == COND_EXPR) /* Use build_conditional_expr instead. */ gcc_unreachable (); - else if (! IS_OVERLOAD_TYPE (TREE_TYPE (arg1)) - && (! arg2 || ! IS_OVERLOAD_TYPE (TREE_TYPE (arg2)))) + else if (! OVERLOAD_TYPE_P (TREE_TYPE (arg1)) + && (! arg2 || ! OVERLOAD_TYPE_P (TREE_TYPE (arg2)))) goto builtin; if (code == POSTINCREMENT_EXPR || code == POSTDECREMENT_EXPR) diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 6ac9a361486..58248bf0a1e 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1319,7 +1319,7 @@ struct abi_tag_data static tree find_abi_tags_r (tree *tp, int */*walk_subtrees*/, void *data) { - if (!TAGGED_TYPE_P (*tp)) + if (!OVERLOAD_TYPE_P (*tp)) return NULL_TREE; if (tree attributes = lookup_attribute ("abi_tag", TYPE_ATTRIBUTES (*tp))) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 08a646124bf..83164a28524 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1233,7 +1233,7 @@ enum languages { lang_c, lang_cplusplus, lang_java }; /* Nonzero if NODE has no name for linkage purposes. */ #define TYPE_ANONYMOUS_P(NODE) \ - (TAGGED_TYPE_P (NODE) && ANON_AGGRNAME_P (TYPE_LINKAGE_IDENTIFIER (NODE))) + (OVERLOAD_TYPE_P (NODE) && ANON_AGGRNAME_P (TYPE_LINKAGE_IDENTIFIER (NODE))) /* The _DECL for this _TYPE. */ #define TYPE_MAIN_DECL(NODE) (TYPE_STUB_DECL (TYPE_MAIN_VARIANT (NODE))) @@ -1270,9 +1270,8 @@ enum languages { lang_c, lang_cplusplus, lang_java }; /* Keep these checks in ascending code order. */ #define RECORD_OR_UNION_CODE_P(T) \ ((T) == RECORD_TYPE || (T) == UNION_TYPE) -#define TAGGED_TYPE_P(T) \ +#define OVERLOAD_TYPE_P(T) \ (CLASS_TYPE_P (T) || TREE_CODE (T) == ENUMERAL_TYPE) -#define IS_OVERLOAD_TYPE(T) TAGGED_TYPE_P (T) /* True if this a "Java" type, defined in 'extern "Java"'. */ #define TYPE_FOR_JAVA(NODE) TYPE_LANG_FLAG_3 (NODE) diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 9e280eac9f7..40200b005f9 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4182,7 +4182,7 @@ void warn_misplaced_attr_for_class_type (source_location location, tree class_type) { - gcc_assert (TAGGED_TYPE_P (class_type)); + gcc_assert (OVERLOAD_TYPE_P (class_type)); warning_at (location, OPT_Wattributes, "attribute ignored in declaration " @@ -4497,7 +4497,7 @@ start_decl (const cp_declarator *declarator, /* If this is a typedef that names the class for linkage purposes (7.1.3p8), apply any attributes directly to the type. */ if (TREE_CODE (decl) == TYPE_DECL - && TAGGED_TYPE_P (TREE_TYPE (decl)) + && OVERLOAD_TYPE_P (TREE_TYPE (decl)) && decl == TYPE_NAME (TYPE_MAIN_VARIANT (TREE_TYPE (decl)))) flags = ATTR_FLAG_TYPE_IN_PLACE; else @@ -10938,7 +10938,7 @@ type_is_deprecated (tree type) return type; /* Do warn about using typedefs to a deprecated class. */ - if (TAGGED_TYPE_P (type) && type != TYPE_MAIN_VARIANT (type)) + if (OVERLOAD_TYPE_P (type) && type != TYPE_MAIN_VARIANT (type)) return type_is_deprecated (TYPE_MAIN_VARIANT (type)); code = TREE_CODE (type); diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index ef1f1e7d850..407b46159d2 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -868,7 +868,7 @@ grokfield (const cp_declarator *declarator, /* If this is a typedef that names the class for linkage purposes (7.1.3p8), apply any attributes directly to the type. */ - if (TAGGED_TYPE_P (TREE_TYPE (value)) + if (OVERLOAD_TYPE_P (TREE_TYPE (value)) && value == TYPE_NAME (TYPE_MAIN_VARIANT (TREE_TYPE (value)))) attrflags = ATTR_FLAG_TYPE_IN_PLACE; @@ -1934,7 +1934,7 @@ min_vis_r (tree *tp, int *walk_subtrees, void *data) { *walk_subtrees = 0; } - else if (TAGGED_TYPE_P (*tp) + else if (OVERLOAD_TYPE_P (*tp) && !TREE_PUBLIC (TYPE_MAIN_DECL (*tp))) { *vis_p = VISIBILITY_ANON; diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2335dd3be96..8671bd95d4a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -324,7 +324,7 @@ get_template_info (const_tree t) if (!tinfo && DECL_IMPLICIT_TYPEDEF_P (t)) t = TREE_TYPE (t); - if (TAGGED_TYPE_P (t)) + if (OVERLOAD_TYPE_P (t)) tinfo = TYPE_TEMPLATE_INFO (t); else if (TREE_CODE (t) == BOUND_TEMPLATE_TEMPLATE_PARM) tinfo = TEMPLATE_TEMPLATE_PARM_TEMPLATE_INFO (t); diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index ce9568c505e..580b6770ae7 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3306,7 +3306,7 @@ handle_abi_tag_attribute (tree* node, tree name, tree args, { if (TYPE_P (*node)) { - if (!TAGGED_TYPE_P (*node)) + if (!OVERLOAD_TYPE_P (*node)) { error ("%qE attribute applied to non-class, non-enum type %qT", name, *node);