PR c++/52759

	* decl.c (start_decl): Don't call maybe_apply_pragma_weak
	if processing_template_decl.

	* g++.dg/ext/weak4.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@185967 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 00e89e2e355edc0a2faad58fdaf216ad2ea5ad4f..2ada456d714899301729b81da1e36eb6044299bf 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-29  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/52759
+       * decl.c (start_decl): Don't call maybe_apply_pragma_weak
+       if processing_template_decl.
+
 2012-03-29  Jason Merrill  <jason@redhat.com>
 
        PR c++/52743

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 74307b1a8af34b99263eb5c664f2876f40d1812e..01a199f0daea06d568963c43d1055a2d227f0f14 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4420,7 +4420,8 @@ start_decl (const cp_declarator *declarator,
     }
 
   /* If #pragma weak was used, mark the decl weak now.  */
-  maybe_apply_pragma_weak (decl);
+  if (!processing_template_decl)
+    maybe_apply_pragma_weak (decl);
 
   if (TREE_CODE (decl) == FUNCTION_DECL
       && DECL_DECLARED_INLINE_P (decl)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 14dfe57c085a8dadf0bf5148fb214f3d075efff5..b149fcd5dc211a00998ecd394ff68b55475837c1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-29  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/52759
+       * g++.dg/ext/weak4.C: New test.
+
 2012-03-29  Jason Merrill  <jason@redhat.com>
 
        PR c++/52743

diff --git a/gcc/testsuite/g++.dg/ext/weak4.C b/gcc/testsuite/g++.dg/ext/weak4.C
new file mode 100644 (file)
index 0000000..5b3cce0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/weak4.C
@@ -0,0 +1,9 @@
+// PR c++/52759
+// { dg-do compile }
+// { dg-require-weak "" }
+// { dg-options "" }
+#pragma weak foo
+template <typename T>
+struct A { };
+template <typename T>
+void bar (A<T> &);