diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1da821b7275..50ec68d0925 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/58816
+	* pt.c (apply_late_template_attributes): Use get_attribute_name,
+	not TREE_PURPOSE.
+
 2013-10-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/58466
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e04bdcc81cb..cbb0339a319 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8610,7 +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 (attribute_takes_identifier_p (TREE_PURPOSE (t)))
+	      else if (attribute_takes_identifier_p (get_attribute_name (t)))
 		{
 		  tree chain
 		    = tsubst_expr (TREE_CHAIN (TREE_VALUE (t)), args, complain,