Commit 1ac198fa authored by nathan's avatar nathan
Browse files

* pt.c (lookup_template_class): Remove abort.

	* tree.c (get_type_decl): Allow error_mark_node.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36134 138bc75d-0d04-0410-961f-82ee72b054a4
parent ff5f6f06
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
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment