From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 12 Nov 1997 20:16:34 +0000 (+0000)
Subject: thinko
X-Git-Tag: releases/egcs-1.0.0~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f72001bacbb3558d282a25564b5dedbbd0608bb;p=thirdparty%2Fgcc.git

thinko

From-SVN: r16447
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index be548a8c91ce..16e98840e2ce 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 48fe7a4a2c88..9dd1c7f12036 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)))