re PR c++/19063 (ICE on invalid template parameter)

	* name-lookup.c (pushtag): Remove accidental commit from:
	2004-12-21  Mark Mitchell  <mark@codesourcery.com>
	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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 061ab2fa1c725dda4c084f15f4096d89f00d308d..6c4108faf90bcd1e20500d9e6827001445a96f66 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-05  Mark Mitchell  <mark@codesourcery.com>
+
+       * name-lookup.c (pushtag): Remove accidental commit from:
+       2004-12-21  Mark Mitchell  <mark@codesourcery.com>
+       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  <kazu@codesourcery.com>
 
        * 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 a4c33a31de27def6d48f58f2336913707e7f1911..70ecfadcbae290b18e8cac376ac6ee87b3b5b139 100644 (file)
--- 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