While waiting for a build to finish I figured I might as well do this.

Bootstrapped/regtested on x86_64-linux, applying to trunk.

2015-11-16  Marek Polacek  <pola...@redhat.com>

        * c-ada-spec.c (dump_ada_template): Use RECORD_OR_UNION_TYPE_P.
        * c-common.c (c_common_get_alias_set): Likewise.
        (handle_visibility_attribute): Likewise.

diff --git gcc/c-family/c-ada-spec.c gcc/c-family/c-ada-spec.c
index 216bd6f..e85c1a9 100644
--- gcc/c-family/c-ada-spec.c
+++ gcc/c-family/c-ada-spec.c
@@ -1758,8 +1758,7 @@ dump_ada_template (pretty_printer *buffer, tree t, int 
spc)
 
       /* We are interested in concrete template instantiations only: skip
         partially specialized nodes.  */
-      if ((TREE_CODE (instance) == RECORD_TYPE
-          || TREE_CODE (instance) == UNION_TYPE)
+      if (RECORD_OR_UNION_TYPE_P (instance)
          && cpp_check && cpp_check (instance, HAS_DEPENDENT_TEMPLATE_ARGS))
        continue;
 
diff --git gcc/c-family/c-common.c gcc/c-family/c-common.c
index f8ccb6d..a062f81 100644
--- gcc/c-family/c-common.c
+++ gcc/c-family/c-common.c
@@ -5344,19 +5344,15 @@ c_common_get_alias_set (tree t)
           TREE_CODE (t2) == POINTER_TYPE;
           t2 = TREE_TYPE (t2))
        ;
-      if (TREE_CODE (t2) != RECORD_TYPE
-         && TREE_CODE (t2) != ENUMERAL_TYPE
-         && TREE_CODE (t2) != QUAL_UNION_TYPE
-         && TREE_CODE (t2) != UNION_TYPE)
+      if (!RECORD_OR_UNION_TYPE_P (t2)
+         && TREE_CODE (t2) != ENUMERAL_TYPE)
        return -1;
       if (TYPE_SIZE (t2) == 0)
        return -1;
     }
   /* These are the only cases that need special handling.  */
-  if (TREE_CODE (t) != RECORD_TYPE
+  if (!RECORD_OR_UNION_TYPE_P (t)
       && TREE_CODE (t) != ENUMERAL_TYPE
-      && TREE_CODE (t) != QUAL_UNION_TYPE
-      && TREE_CODE (t) != UNION_TYPE
       && TREE_CODE (t) != POINTER_TYPE)
     return -1;
   /* Undefined? */
@@ -8644,7 +8640,7 @@ handle_visibility_attribute (tree *node, tree name, tree 
args,
     {
       if (TREE_CODE (*node) == ENUMERAL_TYPE)
        /* OK */;
-      else if (TREE_CODE (*node) != RECORD_TYPE && TREE_CODE (*node) != 
UNION_TYPE)
+      else if (!RECORD_OR_UNION_TYPE_P (*node))
        {
          warning (OPT_Wattributes, "%qE attribute ignored on non-class types",
                   name);

        Marek

Reply via email to