Merge in trunk.

[thirdparty/gcc.git] / gcc / cp / tree.c

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 96d027bbd31a3233b9af0dfc6f7a8c536fb9af5b..7d895bd96bd34dc87965e95f9c2092ee82de861f 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -3364,6 +3364,18 @@ handle_abi_tag_attribute (tree* node, tree name, tree args,
                 name, *node);
          goto fail;
        }
+      else if (CLASSTYPE_TEMPLATE_INSTANTIATION (*node))
+       {
+         warning (OPT_Wattributes, "ignoring %qE attribute applied to "
+                  "template instantiation %qT", name, *node);
+         goto fail;
+       }
+      else if (CLASSTYPE_TEMPLATE_SPECIALIZATION (*node))
+       {
+         warning (OPT_Wattributes, "ignoring %qE attribute applied to "
+                  "template specialization %qT", name, *node);
+         goto fail;
+       }
 
       tree attributes = TYPE_ATTRIBUTES (*node);
       tree decl = TYPE_NAME (*node);