pt.c (apply_late_template_attributes): Use attribute_takes_identifier_p.

	* pt.c (apply_late_template_attributes): Use
	attribute_takes_identifier_p.

From-SVN: r203727

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2091b9f..9b15f55 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2013-10-16  Jason Merrill  <jason@redhat.com>
 
+       * pt.c (apply_late_template_attributes): Use
+       attribute_takes_identifier_p.
+
        * error.c (dump_exception_spec): Print "noexcept" rather than
        "noexcept (true)".
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index a1eb7a2..e9c3ce2 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8610,10 +8610,7 @@ apply_late_template_attributes (tree *decl_p, tree attributes, int attr_flags,
                 pass it through tsubst.  Attributes like mode, format,
                 cleanup and several target specific attributes expect it
                 unmodified.  */
-             else if (TREE_VALUE (t)
-                      && TREE_CODE (TREE_VALUE (t)) == TREE_LIST
-                      && TREE_VALUE (TREE_VALUE (t))
-                      && identifier_p (TREE_VALUE (TREE_VALUE (t))))
+             else if (attribute_takes_identifier_p (TREE_PURPOSE (t)))
                {
                  tree chain
                    = tsubst_expr (TREE_CHAIN (TREE_VALUE (t)), args, complain,