pt.c (lookup_template_class): Remove abort.

* pt.c (lookup_template_class): Remove abort.
	* tree.c (get_type_decl): Allow error_mark_node.

From-SVN: r36134
This commit is contained in:
Nathan Sidwell 2000-09-04 10:28:11 +00:00 committed by Nathan Sidwell
parent 258451c86b
commit 1bc0793e55
3 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2000-09-04 Nathan Sidwell <nathan@codesourcery.com>
* pt.c (lookup_template_class): Remove abort.
* tree.c (get_type_decl): Allow error_mark_node.
2000-09-04 Nathan Sidwell <nathan@codesourcery.com>
* decl2.c (arg_assoc): Deal with COMPONENT_REFs inside

View File

@ -3770,14 +3770,12 @@ lookup_template_class (d1, arglist, in_decl, context, entering_scope)
d1 = DECL_NAME (template);
context = DECL_CONTEXT (template);
}
else
my_friendly_abort (272);
/* With something like `template <class T> class X class X { ... };'
we could end up with D1 having nothing but an IDENTIFIER_VALUE.
We don't want to do that, but we have to deal with the situation,
so let's give them some syntax errors to chew on instead of a
crash. */
crash. Alternatively D1 might not be a template type at all. */
if (! template)
{
cp_error ("`%T' is not a template", d1);

View File

@ -1846,6 +1846,8 @@ get_type_decl (t)
return t;
if (TYPE_P (t))
return TYPE_STUB_DECL (t);
if (t == error_mark_node)
return t;
my_friendly_abort (42);