From 2bd3bc6f5c634b1949a06ff4dfca331b990b10f4 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 12 Nov 1997 20:15:09 +0000 Subject: [PATCH] thinko From-SVN: r16446 --- gcc/cp/ChangeLog | 2 +- gcc/cp/init.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 68f93f03675..aba51473ebb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -4,7 +4,7 @@ Wed Nov 12 11:04:33 1997 Jason Merrill (mark_class_instantiated): If we support one_only but not weak symbols, don't mark this as known. - * init.c (build_new): Handle cookies in EH cleanup. + * init.c (build_new): Handle vec delete in EH cleanup. Wed Nov 12 08:11:55 1997 Benjamin Kosnik diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 48fe7a4a2c8..9dd1c7f1203 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -2713,13 +2713,7 @@ build_new (placement, decl, init, use_global_new) /* FIXME: handle placement delete. */ if (flag_exceptions && ! placement) { - tree cleanup; - - if (use_cookie) - cleanup = build (MINUS_EXPR, TREE_TYPE (alloc_expr), - alloc_expr, BI_header_size); - else - cleanup = alloc_expr; + tree cleanup = alloc_expr; if (! use_global_new && TYPE_LANG_SPECIFIC (true_type) && (TYPE_GETS_DELETE (true_type) & (1 << has_array))) -- 2.30.2