diff options
| author | reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-15 09:07:17 +0000 |
|---|---|---|
| committer | reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-15 09:07:17 +0000 |
| commit | 4f4808617a4e54fb75d14fcd31da4d760bed1b4a (patch) | |
| tree | 434df1be050fd0440ff267586347186783e9f496 | |
| parent | 1cdc4670edfa5c07ba04c12e53aab70d08f85950 (diff) | |
| download | ppe42-gcc-4f4808617a4e54fb75d14fcd31da4d760bed1b4a.tar.gz ppe42-gcc-4f4808617a4e54fb75d14fcd31da4d760bed1b4a.zip | |
PR c++/27315
* pt.c (do_decl_instantiation): Return early on invalid decl.
* g++.dg/template/operator6.C: New test.
* g++.dg/template/incomplete3.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113778 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/incomplete3.C | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/operator6.C | 4 |
5 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 739f0e145e1..f34ea88fb99 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2006-05-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/27315 + * pt.c (do_decl_instantiation): Return early on invalid decl. + PR c++/27559 * pt.c (push_template_decl_real): Return error_mark_node instead of broken decl. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index bcf20965764..cf0e7cd4f9a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -11215,7 +11215,7 @@ do_decl_instantiation (tree decl, tree storage) tree result = NULL_TREE; int extern_p = 0; - if (!decl) + if (!decl || decl == error_mark_node) /* An error occurred, for which grokdeclarator has already issued an appropriate message. */ return; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c7ef3aeae72..df0864627f3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2006-05-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/27315 + * g++.dg/template/operator6.C: New test. + * g++.dg/template/incomplete3.C: New test. + PR c++/27559 * g++.dg/template/new4.C: New test. diff --git a/gcc/testsuite/g++.dg/template/incomplete3.C b/gcc/testsuite/g++.dg/template/incomplete3.C new file mode 100644 index 00000000000..8a20bba74d5 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/incomplete3.C @@ -0,0 +1,5 @@ +// PR c++/27315 +// { dg-do compile } + +struct A; // { dg-error "forward declaration" } +template void A::foo<0>(); // { dg-error "before|incomplete" } diff --git a/gcc/testsuite/g++.dg/template/operator6.C b/gcc/testsuite/g++.dg/template/operator6.C new file mode 100644 index 00000000000..94a869bccd5 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/operator6.C @@ -0,0 +1,4 @@ +// PR c++/27315 +// { dg-do compile } + +template void operator+; // { dg-error "non-function" } |
