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

From-SVN: r34888

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6386d66..bce0fea 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 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>

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 9f88761..cef1512 100644 (file)
--- 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: