diff options
| author | Volker Reichelt <reichelt@igpm.rwth-aachen.de> | 2006-05-15 08:58:25 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@gcc.gnu.org> | 2006-05-15 08:58:25 +0000 |
| commit | 7c60008e24503c831098cd8246e5da5b8fcf3537 (patch) | |
| tree | e995f8248a0fdbd7f000773fecb5fab1229db3a3 | |
| parent | dca56f77ee6797d96370360a8d105034223d3e6c (diff) | |
| download | gcc-7c60008e24503c831098cd8246e5da5b8fcf3537.zip gcc-7c60008e24503c831098cd8246e5da5b8fcf3537.tar.gz gcc-7c60008e24503c831098cd8246e5da5b8fcf3537.tar.bz2 | |
re PR c++/27559 (ICE on templated operator new)
PR c++/27559
* pt.c (push_template_decl_real): Return error_mark_node instead
of broken decl.
* g++.dg/template/new4.C: New test.
From-SVN: r113777
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/new4.C | 8 |
4 files changed, 16 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 632c7bb..739f0e1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2006-05-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/27559 + * pt.c (push_template_decl_real): Return error_mark_node instead + of broken decl. + PR c++/27496 * pt.c (tsubst_friend_class): Return early on invalid friend declarations. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1634d2b..bcf2096 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3009,7 +3009,7 @@ push_template_decl_real (tree decl, bool is_friend) template. ... Template allocation functions shall have two or more parameters. */ error ("invalid template declaration of %qD", decl); - return decl; + return error_mark_node; } } else if (DECL_IMPLICIT_TYPEDEF_P (decl) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ea7859d..c7ef3ae 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2006-05-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/27559 + * g++.dg/template/new4.C: New test. + PR c++/27496 * g++.dg/template/void2.C: New test. diff --git a/gcc/testsuite/g++.dg/template/new4.C b/gcc/testsuite/g++.dg/template/new4.C new file mode 100644 index 0000000..bf6f061 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/new4.C @@ -0,0 +1,8 @@ +// PR c++/27559 +// { dg-do compile } + +struct A +{ + template<typename T> + static void* operator new(T) {} // { dg-error "first parameter|invalid template" } +}; |