From d05f521d49e16ad5ac10cf7fe213d36e0d1e0c15 Mon Sep 17 00:00:00 2001 From: pinskia Date: Sun, 28 Jan 2007 18:09:25 +0000 Subject: [PATCH] 2007-01-28 Andrew Pinski PR C++/28988 * semantics.c (finish_pseudo_destructor_expr): Check the destrutor name by calling check_dtor_name. 2007-01-28 Andrew Pinski PR C++/28988 * g++.dg/expr/dtor4.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121261 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/semantics.c | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/expr/dtor4.C | 10 ++++++++++ 4 files changed, 28 insertions(+) create mode 100644 gcc/testsuite/g++.dg/expr/dtor4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e04ee5a..2d8264e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-01-28 Andrew Pinski + + PR C++/28988 + * semantics.c (finish_pseudo_destructor_expr): Check the + destrutor name by calling check_dtor_name. + 2007-01-24 Douglas Gregor * lex.c (D_CPP0X): Rename. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 538f7b4..fea3341 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1956,6 +1956,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 6263465..6282034 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-01-28 Andrew Pinski + + PR C++/28988 + * g++.dg/expr/dtor4.C: New test. + 2007-01-28 Zdenek Dvorak * gcc.dg/tree-ssa/loop-23.c: New test. diff --git a/gcc/testsuite/g++.dg/expr/dtor4.C b/gcc/testsuite/g++.dg/expr/dtor4.C new file mode 100644 index 0000000..7aed80a --- /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 "" } +} -- 2.7.4