* pt.c (tsubst): Don't layout type, if it's error_mark.

From-SVN: r34888

* pt.c (tsubst): Don't layout type, if it's error_mark.
From-SVN: r34888
a5f1c5f8 · Nathan Sidwell · Nathan Sidwell · c2e276fe · a5f1c5f8 · a5f1c5f8
Commit a5f1c5f8 authored Jul 06, 2000 by Nathan Sidwell Committed by Nathan Sidwell Jul 06, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/pt.c
+4 -2

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 2000-07-06  Nathan Sidwell  <nathan@codesourcery.com>

+	* pt.c (tsubst): Don't layout type, if it's error_mark.
+
+2000-07-06  Nathan Sidwell  <nathan@codesourcery.com>
+
 	* pt.c (instantiate_pending_templates): Reset template level.

 2000-07-05  Jason Merrill  <jason@redhat.com>

--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6515,8 +6515,10 @@ tsubst (t, args, complain, in_decl)
 	  r = build_reference_type (type);
 	r = cp_build_qualified_type_real (r, TYPE_QUALS (t), complain);

-	/* Will this ever be needed for TYPE_..._TO values?  */
-	layout_type (r);
+	if (r != error_mark_node)
+	  /* Will this ever be needed for TYPE_..._TO values?  */
+	  layout_type (r);
+	
 	return r;
      }
    case OFFSET_TYPE: