From 912671062574134eafb369d14db8cf6c1d840f1a Mon Sep 17 00:00:00 2001 From: jason Date: Sat, 5 Nov 2011 21:06:34 +0000 Subject: [PATCH] * decl.c (cp_finish_decl): Mostly revert previous change. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181017 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 200621e..642c507 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2011-11-05 Jason Merrill + + * decl.c (cp_finish_decl): Mostly revert previous change. + 2011-11-04 Jason Merrill PR c++/26714 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 65413df..d2daf91 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; -- 2.7.4