diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-11-10 08:36:09 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-11-10 08:36:09 +0100 |
| commit | 3d9b2eb64f64c87952dd974a96e2756bdcf2e4b3 (patch) | |
| tree | 9319bec3789d86a6c306bf63c392bc06557c2af8 /gcc | |
| parent | 49b5e2f6b50347329eaddd44becfec13633f940e (diff) | |
| download | gcc-3d9b2eb64f64c87952dd974a96e2756bdcf2e4b3.zip gcc-3d9b2eb64f64c87952dd974a96e2756bdcf2e4b3.tar.gz gcc-3d9b2eb64f64c87952dd974a96e2756bdcf2e4b3.tar.bz2 | |
re PR c++/32241 (ICE trying to call x.~X(); in a template)
PR c++/32241
* pt.c (tsubst_copy_and_build) <case COMPONENT_REF>: If object_type
is not scalar type, let finish_class_member_access_expr handle
diagnostics. Pass BIT_NOT_EXPR argument to
finish_pseudo_destructor_expr. Handle SCOPE_REF properly.
* g++.dg/template/pseudodtor3.C: New test.
From-SVN: r130066
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 26 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/pseudodtor3.C | 43 |
4 files changed, 73 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 242f4ae..c046bfd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2007-11-10 Jakub Jelinek <jakub@redhat.com> + + PR c++/32241 + * pt.c (tsubst_copy_and_build) <case COMPONENT_REF>: If object_type + is not scalar type, let finish_class_member_access_expr handle + diagnostics. Pass BIT_NOT_EXPR argument to + finish_pseudo_destructor_expr. Handle SCOPE_REF properly. + 2007-11-09 Douglas Gregor <doug.gregor@gmail.com> PR c++/33510 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0ac7314..4d9f122 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -11004,15 +11004,23 @@ tsubst_copy_and_build (tree t, if (object_type && !CLASS_TYPE_P (object_type)) { - if (TREE_CODE (member) == BIT_NOT_EXPR) - return finish_pseudo_destructor_expr (object, - NULL_TREE, - object_type); - else if (TREE_CODE (member) == SCOPE_REF - && (TREE_CODE (TREE_OPERAND (member, 1)) == BIT_NOT_EXPR)) - return finish_pseudo_destructor_expr (object, - object, - object_type); + if (SCALAR_TYPE_P (object_type)) + { + tree s = NULL_TREE; + tree dtor = member; + + if (TREE_CODE (dtor) == SCOPE_REF) + { + s = TREE_OPERAND (dtor, 0); + dtor = TREE_OPERAND (dtor, 1); + } + if (TREE_CODE (dtor) == BIT_NOT_EXPR) + { + dtor = TREE_OPERAND (dtor, 0); + if (TYPE_P (dtor)) + return finish_pseudo_destructor_expr (object, s, dtor); + } + } } else if (TREE_CODE (member) == SCOPE_REF && TREE_CODE (TREE_OPERAND (member, 1)) == TEMPLATE_ID_EXPR) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8ca5494..b8c1b2b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-11-10 Jakub Jelinek <jakub@redhat.com> + + PR c++/32241 + * g++.dg/template/pseudodtor3.C: New test. + 2007-11-09 Douglas Gregor <doug.gregor@gmail.com> PR c++/33510 diff --git a/gcc/testsuite/g++.dg/template/pseudodtor3.C b/gcc/testsuite/g++.dg/template/pseudodtor3.C new file mode 100644 index 0000000..5f392f4 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/pseudodtor3.C @@ -0,0 +1,43 @@ +// PR c++/32241 +// { dg-do compile } + +struct A +{ + typedef int T; + T &foo (); + A () { foo.~T (); } // { dg-error "does not have class type|expected" } +}; + +template <typename T> struct B +{ + T &foo (); + B () { foo.~T (); } // { dg-error "invalid use of member" } +}; + +B<int> b; + +template <typename T, typename S> struct C +{ + T t; + C () { t.~S (); } // { dg-error "is not of type" } +}; + +C<int, long int> c; + +template <typename T> struct D +{ + T t; + typedef long int U; + D () { t.~U (); } // { dg-error "is not of type" } +}; + +D<int> d; + +template <typename T> struct E +{ + T &foo (); + typedef long int U; + E () { foo.~U (); } // { dg-error "is not of type" } +}; + +E<int> e; |