From b59500727a41819a433486abaa8dd211b339650e Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Mon, 29 May 2006 19:22:18 +0000 Subject: [PATCH] re PR c++/27713 (ICE on invalid operator new) PR c++/27713 * pt.c (push_template_decl_real): Return error_mark_node instead of broken decl. * g++.dg/template/new6.C: New test. From-SVN: r114211 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/pt.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/new6.C | 7 +++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/new6.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7e1d11e19dbb..2adc98979760 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-05-29 Volker Reichelt + + PR c++/27713 + * pt.c (push_template_decl_real): Return error_mark_node instead + of broken decl. + 2006-05-22 Volker Reichelt PR c++/27716 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0b7f2e67c6b5..e4b2d70add85 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -2979,7 +2979,7 @@ push_template_decl_real (tree decl, int 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 3b28f118103e..48a2af657d40 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-05-29 Volker Reichelt + + PR c++/27713 + * g++.dg/template/new6.C: New test. + 2006-05-22 Volker Reichelt PR c++/27716 diff --git a/gcc/testsuite/g++.dg/template/new6.C b/gcc/testsuite/g++.dg/template/new6.C new file mode 100644 index 000000000000..4db068512bd9 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/new6.C @@ -0,0 +1,7 @@ +// PR c++/27713 +// { dg-do compile } + +struct A +{ + template friend void* operator new(__SIZE_TYPE__); // { dg-error "invalid template" } +}; -- 2.47.2