summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-28 18:18:54 +0000
committerpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-28 18:18:54 +0000
commit1d11da7796c4a50189b18151e5dc6dc385c95e24 (patch)
tree96307579879296d8be542506649958a02a96dc3c
parent40cdadaab5eadc98579ac5eccb9568999d5bd703 (diff)
downloadgcc-1d11da7796c4a50189b18151e5dc6dc385c95e24.tar.gz
2007-01-28 Andrew Pinski <pinskia@gmail.com>
PR C++/28988 * semantics.c (finish_pseudo_destructor_expr): Check the destrutor name by calling check_dtor_name. 2007-01-28 Andrew Pinski <pinskia@gmail.com> PR C++/28988 * g++.dg/expr/dtor4.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_1-branch@121263 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/semantics.c7
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/expr/dtor4.C10
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 33b070fd7d6..9670a4ea733 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-28 Andrew Pinski <pinskia@gmail.com>
+
+ PR C++/28988
+ * semantics.c (finish_pseudo_destructor_expr): Check the
+ destrutor name by calling check_dtor_name.
+
2007-01-10 Mark Mitchell <mark@codesourcery.com>
PR c++/28999
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index a28106cb161..eaebdd8f493 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1972,6 +1972,13 @@ finish_pseudo_destructor_expr (tree object, tree scope, tree destructor)
error ("invalid qualifying scope in pseudo-destructor name");
return error_mark_node;
}
+ if (scope && TYPE_P (scope) && !check_dtor_name (scope, destructor))
+ {
+ error ("qualified type %qT does not match destructor name ~%qT",
+ scope, destructor);
+ return error_mark_node;
+ }
+
/* [expr.pseudo] says both:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9cc19634f93..70f0fa201f0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-28 Andrew Pinski <pinskia@gmail.com>
+
+ PR C++/28988
+ * g++.dg/expr/dtor4.C: New test.
+
2007-01-27 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/30278
diff --git a/gcc/testsuite/g++.dg/expr/dtor4.C b/gcc/testsuite/g++.dg/expr/dtor4.C
new file mode 100644
index 00000000000..7aed80a69bd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/expr/dtor4.C
@@ -0,0 +1,10 @@
+typedef int C;
+typedef double D;
+
+void
+f ()
+{
+ C o;
+
+ o.D::~C (); // { dg-error "" }
+}