re PR c++/29077 (Incorrect error message for destructor in wrong namespace)

2007-03-28  Simon Martin  <simartin@users.sourceforge.net>

	PR c++/29077
	* decl.c (grokfndecl): Properly setup decl if it is a constructor or a
	destructor.

From-SVN: r123312

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a2a0f6ef90cb33c75cc196dc9914af70af2910d5..4f2b06191efa5d4c1d17abf5e0036e0fcb762995 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-28  Simon Martin  <simartin@users.sourceforge.net>
+
+       PR c++/29077
+       * decl.c (grokfndecl): Properly setup decl if it is a constructor or a
+       destructor.
+
 2007-03-28 Douglas Gregor <doug.gregor@gmail.com>
 
        * parser.c (struct cp_parser): Update comment for

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index ce1c54f10cdc007a9e71e43d90d3a9c3cf91e1cb..0315f01241d05bcde3a0e9b94910674095f667cb 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5981,6 +5981,20 @@ grokfndecl (tree ctype,
   if (TYPE_VOLATILE (type))
     TREE_THIS_VOLATILE (decl) = 1;
 
+  /* Setup decl according to sfk.  */
+  switch (sfk)
+    {
+    case sfk_constructor:
+    case sfk_copy_constructor:
+      DECL_CONSTRUCTOR_P (decl) = 1;
+      break;
+    case sfk_destructor:
+      DECL_DESTRUCTOR_P (decl) = 1;
+      break;
+    default:
+      break;
+    }
+
   if (friendp
       && TREE_CODE (orig_declarator) == TEMPLATE_ID_EXPR)
     {
@@ -6168,12 +6182,7 @@ grokfndecl (tree ctype,
     return decl;
 
   if (ctype != NULL_TREE)
-    {
-      if (sfk == sfk_constructor)
-       DECL_CONSTRUCTOR_P (decl) = 1;
-
-      grokclassfn (ctype, decl, flags);
-    }
+    grokclassfn (ctype, decl, flags);
 
   decl = check_explicit_specialization (orig_declarator, decl,
                                        template_count,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b3b28b30527ea6f9f7031bc314a2e2d3ff857fd3..9b5244e597fdfb35b3671774a90f3fbd77b06db8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-28  Simon Martin  <simartin@users.sourceforge.net>
+
+       PR c++/29077
+       * g++.dg/parse/constructor3.C: New test.
+
 2007-03-28  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/thin_pointer.ad[sb]: New test.

diff --git a/gcc/testsuite/g++.dg/parse/constructor3.C b/gcc/testsuite/g++.dg/parse/constructor3.C
new file mode 100644 (file)
index 0000000..9a2e978
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/constructor3.C
@@ -0,0 +1,14 @@
+/* PR c++/29077 */
+/* { dg-do "compile" } */
+
+class c {
+  c();
+  c(const c&);
+  ~c();
+};
+
+namespace m {
+  c::c() {} /* { dg-error "c::c" } */
+  c::c(const c&) {} /* { dg-error "c::c" } */
+  c::~c() {} /* { dg-error "c::~c" } */
+}