From 55ea5ddf26a4377d541244194ceb0b72c675a98f Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 16 Oct 2013 17:58:35 -0400 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/pt.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2091b9fc595..9b15f555687 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2013-10-16 Jason Merrill + * 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 a1eb7a2d35d..e9c3ce2ab99 100644 --- 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, -- 2.30.2