From: Marek Polacek <polacek@redhat.com>
Date: Mon, 16 Nov 2015 17:58:39 +0000 (+0000)
Subject: c-ada-spec.c (dump_ada_template): Use RECORD_OR_UNION_TYPE_P.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a868811ee5cbec135266c1cce7b2defb5e2c6bf4;p=gcc.git

c-ada-spec.c (dump_ada_template): Use RECORD_OR_UNION_TYPE_P.

	* 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.

From-SVN: r230432
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 518c5ef229b..e9851aa6ddd 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-16  Marek Polacek  <polacek@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.
+
 2015-11-16  Kirill Yukhin  <kirill.yukhin@intel.com>
 
 	* c-common.c (handle_simd_attribute): New.
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index 216bd6fa809..e85c1a9a7d5 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/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 a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index f8ccb6d62c0..a062f81a1c3 100644
--- a/gcc/c-family/c-common.c
+++ b/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);