diff options
author | Jakub Jelinek <jakub@redhat.com> | 2009-06-08 18:48:11 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-06-08 18:48:11 +0200 |
commit | b792a33ca458beea5f114eba261a5e8cd42145e3 (patch) | |
tree | 681c634cf476b1df5d1e4ed4caf18a21e5369a67 /gcc | |
parent | 5f4a82c0c51befe5a6a4eae3e371cdeec85a7dd6 (diff) | |
download | gcc-b792a33ca458beea5f114eba261a5e8cd42145e3.zip gcc-b792a33ca458beea5f114eba261a5e8cd42145e3.tar.gz gcc-b792a33ca458beea5f114eba261a5e8cd42145e3.tar.bz2 |
re PR c++/40373 (ICE with invalid destructor call)
PR c++/40373
* call.c (check_dtor_name): Return false even if
get_type_value (name) is error_mark_node.
* g++.dg/template/dtor7.C: New test.
From-SVN: r148282
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/cp/call.c | 2 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/dtor7.C | 24 |
4 files changed, 32 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5c0d473..d9327a9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2009-06-08 Jakub Jelinek <jakub@redhat.com> + PR c++/40373 + * call.c (check_dtor_name): Return false even if + get_type_value (name) is error_mark_node. + PR c++/40370 PR c++/40372 * parser.c (cp_parser_direct_declarator): Don't set TREE_SIDE_EFFECTS diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 1ab27c7..db45ab0 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -242,7 +242,7 @@ check_dtor_name (tree basetype, tree name) return false; } - if (!name) + if (!name || name == error_mark_node) return false; return same_type_p (TYPE_MAIN_VARIANT (basetype), TYPE_MAIN_VARIANT (name)); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2a32d8f..c6e7618 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -4,6 +4,9 @@ * gcc.dg/builtin-object-size-4.c (test1): Adjust expected results. * gcc.dg/builtin-object-size-6.c: New test. + PR c++/40373 + * g++.dg/template/dtor7.C: New test. + PR c++/40370 PR c++/40372 * g++.dg/template/error41.C: New test. diff --git a/gcc/testsuite/g++.dg/template/dtor7.C b/gcc/testsuite/g++.dg/template/dtor7.C new file mode 100644 index 0000000..0dac69e --- /dev/null +++ b/gcc/testsuite/g++.dg/template/dtor7.C @@ -0,0 +1,24 @@ +// PR c++/40373 +// { dg-compile } + +struct A; // { dg-bogus "candidates are" "" { xfail *-*-* } } +namespace +{ + struct A; // { dg-bogus "struct" "" { xfail *-*-* } } +} + +struct B {}; + +template <typename T> void +foo (T t) +{ + t.~A (); // { dg-error "does not match destructor name" } +} + +void +bar () +{ + foo (B ()); // { dg-bogus "instantiated from here" "" { xfail *-*-* } } +} + +// { dg-bogus "is ambiguous" "" { xfail *-*-* } 15 } |