pt.c (tsubst_expr, [...]): Don't process if tsubsting fails.

	* pt.c (tsubst_expr, DECL_STMT case): Don't process if
	tsubsting fails.

From-SVN: r36720

gcc/cp/ChangeLog

 2000-10-05  Nathan Sidwell  <nathan@codesourcery.com>
 
+	* pt.c (tsubst_expr, DECL_STMT case): Don't process if
+	tsubsting fails.	
+
+2000-10-05  Nathan Sidwell  <nathan@codesourcery.com>
+
 	* spew.c (frob_id): New static function.
 	(frob_opname): Use it.
 	(yylex): Use it.

gcc/cp/pt.c

@@ -7145,6 +7145,8 @@ tsubst_expr (t, args, complain, in_decl)
 	    init = DECL_INITIAL (decl);
 	    decl = tsubst (decl, args, complain, in_decl);
 	    init = tsubst_expr (init, args, complain, in_decl);
+	    if (decl != error_mark_node)
+	      {
 	        if (init)
 	          DECL_INITIAL (decl) = error_mark_node;
 	        /* By marking the declaration as instantiated, we avoid
@@ -7157,6 +7159,7 @@ tsubst_expr (t, args, complain, in_decl)
 	        maybe_push_decl (decl);
 	        cp_finish_decl (decl, init, NULL_TREE, 0);
 	      }
+	  }
 	return decl;
       }