From 7c60008e24503c831098cd8246e5da5b8fcf3537 Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Mon, 15 May 2006 08:58:25 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/pt.c | 2 +- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/template/new4.C | 8 ++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/new4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 632c7bbc29a..739f0e145e1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2006-05-15 Volker Reichelt + 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 1634d2b932f..bcf20965764 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 ea7859d3122..c7ef3aeae72 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2006-05-15 Volker Reichelt + 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 00000000000..bf6f06100c7 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/new4.C @@ -0,0 +1,8 @@ +// PR c++/27559 +// { dg-do compile } + +struct A +{ + template + static void* operator new(T) {} // { dg-error "first parameter|invalid template" } +}; -- 2.30.2