diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/decl2.cc | 7 | ||||
| -rw-r--r-- | gcc/cp/pt.cc | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc index 9e135af..8ec9740 100644 --- a/gcc/cp/decl2.cc +++ b/gcc/cp/decl2.cc @@ -1468,7 +1468,8 @@ is_late_template_attribute (tree attr, tree decl) { tree name = get_attribute_name (attr); tree args = TREE_VALUE (attr); - const struct attribute_spec *spec = lookup_attribute_spec (name); + const struct attribute_spec *spec + = lookup_attribute_spec (TREE_PURPOSE (attr)); tree arg; if (!spec) @@ -1512,7 +1513,9 @@ is_late_template_attribute (tree attr, tree decl) second and following arguments. Attributes like mode, format, cleanup and several target specific attributes aren't late just because they have an IDENTIFIER_NODE as first argument. */ - if (arg == args && attribute_takes_identifier_p (name) + if (arg == args + && get_attribute_namespace (attr) == gnu_identifier + && attribute_takes_identifier_p (name) && identifier_p (t)) continue; diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 7a019d3..8498730 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -12386,7 +12386,8 @@ tsubst_attribute (tree t, tree *decl_p, tree args, pass it through tsubst. Attributes like mode, format, cleanup and several target specific attributes expect it unmodified. */ - else if (attribute_takes_identifier_p (get_attribute_name (t))) + else if (get_attribute_namespace (t) == gnu_identifier + && attribute_takes_identifier_p (get_attribute_name (t))) { tree chain = tsubst_expr (TREE_CHAIN (val), args, complain, in_decl); |