From: Mike Stump <mrs@wrs.com>
Date: Fri, 13 Feb 1998 14:07:32 +0000 (+0000)
Subject: * init.c (build_new): Propagate error_mark_node up.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8017079182d9bc07dca83a8d10f1e52ee8c245ec;p=gcc.git

* init.c (build_new): Propagate error_mark_node up.

From-SVN: r17968
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bdad01d52af..3dfba2e3bdd 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 13 14:06:22 1998  Mike Stump  <mrs@wrs.com>
+
+	* init.c (build_new): Propagate error_mark_node up.
+
 Fri Feb 13 13:24:32 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* parse.y (simple_stmt): If the condition isn't a declaration, 
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index c3bb1a86ee6..ced15d45c86 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -2666,13 +2666,11 @@ build_new_1 (exp)
 	  newrval = build_method_call (newrval, ctor_identifier,
 				       init, TYPE_BINFO (true_type), flags);
 
-	  if (newrval)
-	    {
-	      rval = newrval;
-	      TREE_HAS_CONSTRUCTOR (rval) = 1;
-	    }
-	  else
-	    rval = error_mark_node;
+	  if (newrval == NULL_TREE || newrval == error_mark_node)
+	    return error_mark_node;
+
+	  rval = newrval;
+	  TREE_HAS_CONSTRUCTOR (rval) = 1;
 	}
       else
 	rval = build (VEC_INIT_EXPR, TREE_TYPE (rval),