From d8654d1a75fe2547398d7ee8338018dbdc2670ea Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 5 Aug 2005 21:01:47 +0000 Subject: [PATCH] re PR c++/19063 (ICE on invalid template parameter) * name-lookup.c (pushtag): Remove accidental commit from: 2004-12-21 Mark Mitchell PR c++/19063 * decl.c (grokdeclarator): Return error_mark_node, not void_type_node, to indicate errors. * parser.c (cp_parser_template_parameter_list): Robustify. (cp_parser_template_parameter): Likewise. From-SVN: r102784 --- gcc/cp/ChangeLog | 10 ++++++++++ gcc/cp/name-lookup.c | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 061ab2fa1c72..6c4108faf90b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,13 @@ +2005-08-05 Mark Mitchell + + * name-lookup.c (pushtag): Remove accidental commit from: + 2004-12-21 Mark Mitchell + PR c++/19063 + * decl.c (grokdeclarator): Return error_mark_node, not + void_type_node, to indicate errors. + * parser.c (cp_parser_template_parameter_list): Robustify. + (cp_parser_template_parameter): Likewise. + 2005-08-01 Kazu Hirata * class.c, decl.c, name-lookup.c, pt.c, typeck.c, typeck2.c: diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index a4c33a31de27..70ecfadcbae2 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -4713,9 +4713,6 @@ pushtag (tree name, tree type, tag_scope scope) else if (b->kind != sk_template_parms) d = pushdecl_with_scope (d, b); - if (d == error_mark_node) - POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, error_mark_node); - TYPE_CONTEXT (type) = DECL_CONTEXT (d); /* If this is a local class, keep track of it. We need this -- 2.47.2