re PR c++/25666 (Bad diagnostic for templated destructor as friend)

/cp
2013-05-25  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/25666
	* decl2.c (check_classfn): Check for destructors declared as member
	templates.

/testsuite
2013-05-25  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/25666
	* g++.dg/parse/dtor16.C: New.
	* g++.dg/parse/dtor6.C: Adjust.

From-SVN: r199324

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4d139557523be69619f5d46fa3931f1f40c379fe..ed1d4796624ef9b79a40effc52d665f867470a51 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/25666
+       * decl2.c (check_classfn): Check for destructors declared as member
+       templates.
+
 2013-05-24  Jason Merrill  <jason@redhat.com>
 
        PR c++/56971

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 358a26f4a007d06a08777ca3616f1812fd99ae29..8119210fb06a8ea797885020c2abe003ca742e33 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -646,6 +646,15 @@ check_classfn (tree ctype, tree function, tree template_parms)
   /* OK, is this a definition of a member template?  */
   is_template = (template_parms != NULL_TREE);
 
+  /* [temp.mem]
+
+     A destructor shall not be a member template.  */
+  if (DECL_DESTRUCTOR_P (function) && is_template)
+    {
+      error ("destructor %qD declared as member template", function);
+      return error_mark_node;
+    }
+
   /* We must enter the scope here, because conversion operators are
      named by target type, and type equivalence relies on typenames
      resolving within the scope of CTYPE.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0278d5fe330170f52f3a803ce765b2b5a0484e0..e0d4ccfd0b60e76a47b4d71d2cc8ea9ad63b8663 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/25666
+       * g++.dg/parse/dtor16.C: New.
+       * g++.dg/parse/dtor6.C: Adjust.
+
 2013-05-24  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/19618

diff --git a/gcc/testsuite/g++.dg/parse/dtor16.C b/gcc/testsuite/g++.dg/parse/dtor16.C
new file mode 100644 (file)
index 0000000..ff445c3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/dtor16.C
@@ -0,0 +1,8 @@
+// PR c++/25666
+
+struct A { ~A(); };
+
+struct B
+{
+  template<int> friend A::~A();  // { dg-error "member template" }
+};

diff --git a/gcc/testsuite/g++.dg/parse/dtor6.C b/gcc/testsuite/g++.dg/parse/dtor6.C
index 3333161c39986feb6f0731f807bb546834210956..86370d5d4024824bf0ba8dbd562a1a0afc91c466 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/dtor6.C
+++ b/gcc/testsuite/g++.dg/parse/dtor6.C
@@ -1,8 +1,8 @@
 // PR c++/25638
 
-struct A { ~A(); }; // { dg-error "candidate" }  
+struct A { ~A(); };
 
 struct B : A
 {
-  template<int> friend A::~A(); // { dg-error "match" }
+  template<int> friend A::~A(); // { dg-error "member template" }
 };