re PR c++/20212 (attribute unused vs. member function template)

	PR c++/20212
	* pt.c (regenerate_decl_from_template): Copy attributes for
	parameters from the pattern to the instantiation.

	PR c++/20212
	* g++.dg/warn/Wunused-11.C: New test.

From-SVN: r97726

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4987454a4bb0af047f9eb928d32058635bce00b6..39e5a458e952774735e6ade026a805fa84321707 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-06  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/20212
+       * pt.c (regenerate_decl_from_template): Copy attributes for
+       parameters from the pattern to the instantiation.
+
 2005-04-05  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/20734

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index b609ecf7eab6cd255c6f16cc9e661328e62e2eb8..a6f8ad2e33d33bbbbf19ecaa99b69153217428df 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -11190,6 +11190,7 @@ regenerate_decl_from_template (tree decl, tree tmpl)
       while (decl_parm)
        {
          tree parm_type;
+         tree attributes;
 
          if (DECL_NAME (decl_parm) != DECL_NAME (pattern_parm))
            DECL_NAME (decl_parm) = DECL_NAME (pattern_parm);
@@ -11198,6 +11199,12 @@ regenerate_decl_from_template (tree decl, tree tmpl)
          parm_type = type_decays_to (parm_type);
          if (!same_type_p (TREE_TYPE (decl_parm), parm_type))
            TREE_TYPE (decl_parm) = parm_type;
+         attributes = DECL_ATTRIBUTES (pattern_parm);
+         if (DECL_ATTRIBUTES (decl_parm) != attributes)
+           {
+             DECL_ATTRIBUTES (decl_parm) = attributes;
+             cplus_decl_attributes (&decl_parm, attributes, /*flags=*/0);
+           }
          decl_parm = TREE_CHAIN (decl_parm);
          pattern_parm = TREE_CHAIN (pattern_parm);
        }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index baced9570b4ab1166ef36a36558b2d0c99c69d0e..e70b4b2c41a5fb946b18304dd82e7a0f43dfeb9b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-06  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/20212
+       * g++.dg/warn/Wunused-11.C: New test.
+
 2005-04-06  Bernd Schmidt  <bernd.schmidt@analog.com>
 
        * gcc.c-torture/execute/20020720-1.x: Disable on bfin*-*.

diff --git a/gcc/testsuite/g++.dg/warn/Wunused-11.C b/gcc/testsuite/g++.dg/warn/Wunused-11.C
new file mode 100644 (file)
index 0000000..4a151d2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wunused-11.C
@@ -0,0 +1,11 @@
+// PR c++/20212
+// { dg-options "-O2 -Wunused -Wextra" }
+
+template<int> void f(int);
+void g(int i)
+{
+  f<0>(i);
+}
+template<int> void f(int i __attribute__((unused)) )
+{}
+