diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-10 22:31:40 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-10 22:31:40 +0000 |
| commit | 9bdf7cc7f9d84deb0c8edb7fa2db44a463eec862 (patch) | |
| tree | dedb0b09bfe1e4dffa5c73640494b764302a176d /gcc | |
| parent | 536ae90b00a5e82f6678d8d91cb6ad4b2436c6bf (diff) | |
| download | gcc-9bdf7cc7f9d84deb0c8edb7fa2db44a463eec862.tar.gz | |
PR c++/8372
* pt.c (tsubst_copy): Handle destructor names more correctly.
PR c++/8372
* g++.dg/template/dtor1.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60015 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/dtor1.C | 8 |
4 files changed, 21 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9e56913ef1f..51860c5c527 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,4 +1,10 @@ +2002-12-10 Mark Mitchell <mark@codesourcery.com> + + PR c++/8372 + * pt.c (tsubst_copy): Handle destructor names more correctly. + 2002-12-10 Matt Austern <austern@apple.com> + * cp-tree.h: get rid of needs_virtual_reinit bit. 2002-12-09 Mark Mitchell <mark@codesourcery.com> diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9f1a382bfa7..fa3caac01dc 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7233,9 +7233,10 @@ tsubst_copy (t, args, complain, in_decl) { tree base = tsubst_copy (TREE_OPERAND (name, 0), args, complain, in_decl); - name = TREE_OPERAND (name, 1); - name = tsubst_copy (TREE_OPERAND (name, 0), args, - complain, in_decl); + name = TREE_OPERAND (TREE_OPERAND (name, 1), 0); + if (TREE_CODE (name) == TYPE_DECL) + name = TREE_TYPE (name); + name = tsubst_copy (name, args, complain, in_decl); name = build1 (BIT_NOT_EXPR, NULL_TREE, name); name = build_nt (SCOPE_REF, base, name); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4b064472d42..f54e347f5f2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2002-12-10 Mark Mitchell <mark@codesourcery.com> + PR c++/8372 + * g++.dg/template/dtor1.C: New test. + * g++.old-deja/g++.ext/memconst.C: Use old-deja, not dg, error markers. diff --git a/gcc/testsuite/g++.dg/template/dtor1.C b/gcc/testsuite/g++.dg/template/dtor1.C new file mode 100644 index 00000000000..f5d9d6aad18 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/dtor1.C @@ -0,0 +1,8 @@ +struct A {}; + +template <typename T> struct B +{ + B() { A().A::~A(); } +}; + +B<void> b; |