diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2005-08-05 21:01:47 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2005-08-05 21:01:47 +0000 |
| commit | d8654d1a75fe2547398d7ee8338018dbdc2670ea (patch) | |
| tree | 1bc9d4cacb86e443b1725b32a61cbe60d101486a /gcc | |
| parent | eed61baa40823f0c681f5e5a0e541dfea3f42f68 (diff) | |
| download | gcc-d8654d1a75fe2547398d7ee8338018dbdc2670ea.zip gcc-d8654d1a75fe2547398d7ee8338018dbdc2670ea.tar.gz gcc-d8654d1a75fe2547398d7ee8338018dbdc2670ea.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 061ab2f..6c4108f 100644 --- 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 a4c33a3..70ecfad 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 |