From af7d16c7ab2a10a051f5ead1ce0c425b80e46c73 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 13 Feb 1998 14:07:32 +0000 Subject: [PATCH] * init.c (build_new): Propagate error_mark_node up. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17968 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/init.c | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bdad01d..3dfba2e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +Fri Feb 13 14:06:22 1998 Mike Stump + + * init.c (build_new): Propagate error_mark_node up. + Fri Feb 13 13:24:32 1998 Jason Merrill * parse.y (simple_stmt): If the condition isn't a declaration, diff --git a/gcc/cp/init.c b/gcc/cp/init.c index c3bb1a8..ced15d4 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), -- 2.7.4