From: Jason Merrill <jason@redhat.com>
Date: Wed, 13 Feb 2008 21:27:16 +0000 (-0500)
Subject: PR c++/34962, c++/34937, c++/34939
X-Git-Tag: releases/gcc-4.3.0~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d2eb30433ecedf4db7e00b62320973a587f4216;p=thirdparty%2Fgcc.git

PR c++/34962, c++/34937, c++/34939

        PR c++/34962, c++/34937, c++/34939
        * decl2.c (is_late_template_attribute): Always defer attributes
        vector_size and weak.

From-SVN: r132297
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 65bf6234f9e4..38f951032e6b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-13  Jason Merrill  <jason@redhat.com>
 
+	PR c++/34962, c++/34937, c++/34939
+	* decl2.c (is_late_template_attribute): Always defer attributes 
+	vector_size and weak.
+
 	PR c++/34774
 	* pt.c (value_dependent_expression_p): Look into DECL_INITIAL
 	of enumerators, too.
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 1832926eb317..695390ce78fb 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -991,6 +991,13 @@ is_late_template_attribute (tree attr, tree decl)
     /* Unknown attribute.  */
     return false;
 
+  /* Attribute vector_size handling wants to dive into the back end array
+     building code, which breaks during template processing.  */
+  if (is_attribute_p ("vector_size", name)
+      /* Attribute weak handling wants to write out assembly right away.  */
+      || is_attribute_p ("weak", name))
+    return true;
+
   /* If any of the arguments are dependent expressions, we can't evaluate
      the attribute until instantiation time.  */
   for (arg = args; arg; arg = TREE_CHAIN (arg))
diff --git a/gcc/testsuite/g++.dg/ext/tmplattr9.C b/gcc/testsuite/g++.dg/ext/tmplattr9.C
new file mode 100644
index 000000000000..721ccefecf81
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/tmplattr9.C
@@ -0,0 +1,25 @@
+// PR c++/34937, 34962
+// { dg-options "" }
+
+struct A
+{
+  static const int i;
+};
+
+template<int> void foo()
+{
+  int x[A::i] __attribute((vector_size(8)));
+}
+
+template<int> struct B
+{
+  enum { a, b = a };
+  void bar(B<b>) __attribute((weak));
+};
+
+void f()
+{
+  foo<0>();
+  B<0> b;
+  b.bar (B<B<0>::b>());
+}