aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1997-11-12 20:15:09 +0000
committerJason Merrill <jason@gcc.gnu.org>1997-11-12 15:15:09 -0500
commit2bd3bc6f5c634b1949a06ff4dfca331b990b10f4 (patch)
treeb2b66f7576abd5fc4e57604e78a4f8c41d21b140 /gcc
parenta7d87521b25088ad928ba6d748adcf2ceaeb0c38 (diff)
downloadgcc-2bd3bc6f5c634b1949a06ff4dfca331b990b10f4.zip
gcc-2bd3bc6f5c634b1949a06ff4dfca331b990b10f4.tar.gz
gcc-2bd3bc6f5c634b1949a06ff4dfca331b990b10f4.tar.bz2
thinko
From-SVN: r16446
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/init.c8
2 files changed, 2 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 68f93f0..aba5147 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -4,7 +4,7 @@ Wed Nov 12 11:04:33 1997 Jason Merrill <jason@yorick.cygnus.com>
(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 <bkoz@rhino.cygnus.com>
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 48fe7a4..9dd1c7f 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)))