From: Jason Merrill <jason@redhat.com>
Date: Sat, 5 Nov 2011 21:06:34 +0000 (-0400)
Subject: * decl.c (cp_finish_decl): Mostly revert previous change.
X-Git-Tag: releases/gcc-4.7.0~2453
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90dba8f44e23fc8a9c4723122dd2ab781567f76c;p=thirdparty%2Fgcc.git

* decl.c (cp_finish_decl): Mostly revert previous change.

From-SVN: r181017
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 200621e3f9f9..642c507b350f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-05  Jason Merrill  <jason@redhat.com>
+
+	* decl.c (cp_finish_decl): Mostly revert previous change.
+
 2011-11-04  Jason Merrill  <jason@redhat.com>
 
 	PR c++/26714
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 65413df26203..d2daf9189566 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5907,8 +5907,7 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
 		tree asmspec_tree, int flags)
 {
   tree type;
-  VEC(tree,gc) *cleanups = make_tree_vector ();
-  unsigned i; tree t;
+  VEC(tree,gc) *cleanups = NULL;
   const char *asmspec = NULL;
   int was_readonly = 0;
   bool var_definition_p = false;
@@ -6316,9 +6315,12 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
 
   /* If a CLEANUP_STMT was created to destroy a temporary bound to a
      reference, insert it in the statement-tree now.  */
-  FOR_EACH_VEC_ELT (tree, cleanups, i, t)
-    push_cleanup (decl, t, false);
-  release_tree_vector (cleanups);
+  if (cleanups)
+    {
+      unsigned i; tree t;
+      FOR_EACH_VEC_ELT (tree, cleanups, i, t)
+	push_cleanup (decl, t, false);
+    }
 
   if (was_readonly)
     TREE_READONLY (decl) = 1;