diff options
| author | Jason Merrill <jason@redhat.com> | 2009-02-20 00:32:40 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-02-20 00:32:40 -0500 |
| commit | bd967b22bc9acbf5c77a1a75fc6df199637f55e3 (patch) | |
| tree | ed6eb970c354821a33148d0612bba987c7776597 /gcc | |
| parent | 97eb6215db4b11bba6857d69a587cc49e7f26760 (diff) | |
| download | gcc-bd967b22bc9acbf5c77a1a75fc6df199637f55e3.zip gcc-bd967b22bc9acbf5c77a1a75fc6df199637f55e3.tar.gz gcc-bd967b22bc9acbf5c77a1a75fc6df199637f55e3.tar.bz2 | |
re PR c++/39225 (ICE if destructor doen't match class name)
PR c++/39225
* decl.c (grokdeclarator): Handle ~identifier.
From-SVN: r144314
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/dtor15.C | 16 |
4 files changed, 40 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 00ac24e..ecc83b4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2009-02-20 Jason Merrill <jason@redhat.com> + + PR c++/39225 + * decl.c (grokdeclarator): Handle ~identifier. + 2009-02-19 Jakub Jelinek <jakub@redhat.com> PR target/39175 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 930f944..551764d 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7659,7 +7659,9 @@ grokdeclarator (const cp_declarator *declarator, } type = TREE_OPERAND (decl, 0); - name = IDENTIFIER_POINTER (constructor_name (type)); + if (TYPE_P (type)) + type = constructor_name (type); + name = IDENTIFIER_POINTER (type); dname = decl; } break; @@ -8161,8 +8163,9 @@ grokdeclarator (const cp_declarator *declarator, switch (TREE_CODE (unqualified_id)) { case BIT_NOT_EXPR: - unqualified_id - = constructor_name (TREE_OPERAND (unqualified_id, 0)); + unqualified_id = TREE_OPERAND (unqualified_id, 0); + if (TYPE_P (unqualified_id)) + unqualified_id = constructor_name (unqualified_id); break; case IDENTIFIER_NODE: @@ -9038,21 +9041,20 @@ grokdeclarator (const cp_declarator *declarator, /* Check that the name used for a destructor makes sense. */ if (sfk == sfk_destructor) { + tree uqname = id_declarator->u.id.unqualified_name; + if (!ctype) { gcc_assert (friendp); error ("expected qualified name in friend declaration " - "for destructor %qD", - id_declarator->u.id.unqualified_name); + "for destructor %qD", uqname); return error_mark_node; } - if (!same_type_p (TREE_OPERAND - (id_declarator->u.id.unqualified_name, 0), - ctype)) + if (!check_dtor_name (ctype, TREE_OPERAND (uqname, 0))) { error ("declaration of %qD as member of %qT", - id_declarator->u.id.unqualified_name, ctype); + uqname, ctype); return error_mark_node; } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7a5f58e..e84cac9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-02-20 Jason Merrill <jason@redhat.com> + + PR c++/39225 + * g++.dg/parse/dtor15.C: New test. + 2009-02-19 Kazu Hirata <kazu@codesourcery.com> * gcc.c-torture/execute/20090219-1.c: New. @@ -68,6 +73,9 @@ 2009-02-18 Jason Merrill <jason@redhat.com> + PR c++/38880 + * g++.dg/init/const7.C: Remove XFAIL. + PR target/39179 * g++.dg/opt/const6.C: New test. diff --git a/gcc/testsuite/g++.dg/parse/dtor15.C b/gcc/testsuite/g++.dg/parse/dtor15.C new file mode 100644 index 0000000..ae85a70 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/dtor15.C @@ -0,0 +1,16 @@ +// PR c++/39225 + +template <class T> +class A +{ +public: + A() {} + ~B() {} // { dg-error "~B" } +}; + +int main() +{ + A<int> *a = new A<int>; + + return 0; +} |