thinko

From-SVN: r16446

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 68f93f0367597b0e80badfae92f4e314d2be4b8f..aba51473ebb051ecd60a273f5448daddd5cbef73 100644 (file)
--- 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 48fe7a4a2c88aacff4ace81837bdf970bcc78c2e..9dd1c7f1203652524c577e5a62a0e145aaaad267 100644 (file)
--- 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)))