diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/lifetime1.C | 6 |
4 files changed, 18 insertions, 10 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ffb085c..6c68d87 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-11-04 Jason Merrill <jason@redhat.com> + + PR c++/48370 + * decl.c (cp_finish_decl): Run cleanups in the right order. + 2011-11-04 Eric Botcazou <ebotcazou@adacore.com> PR c++/50608 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 50c45de..65413df 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5907,7 +5907,8 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, tree asmspec_tree, int flags) { tree type; - VEC(tree,gc) *cleanups = NULL; + VEC(tree,gc) *cleanups = make_tree_vector (); + unsigned i; tree t; const char *asmspec = NULL; int was_readonly = 0; bool var_definition_p = false; @@ -6315,12 +6316,9 @@ 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. */ - if (cleanups) - { - unsigned i; tree t; - FOR_EACH_VEC_ELT_REVERSE (tree, cleanups, i, t) - push_cleanup (decl, t, false); - } + FOR_EACH_VEC_ELT (tree, cleanups, i, t) + push_cleanup (decl, t, false); + release_tree_vector (cleanups); if (was_readonly) TREE_READONLY (decl) = 1; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 218a9d3..2e05a08 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-11-04 Jason Merrill <jason@redhat.com> + + PR c++/48370 + * g++.dg/init/lifetime1.C: Test cleanup order. + 2011-11-04 Eric Botcazou <ebotcazou@adacore.com> * g++.dg/other/offsetof7.C: New test. diff --git a/gcc/testsuite/g++.dg/init/lifetime1.C b/gcc/testsuite/g++.dg/init/lifetime1.C index 38e25ec..57f8c62 100644 --- a/gcc/testsuite/g++.dg/init/lifetime1.C +++ b/gcc/testsuite/g++.dg/init/lifetime1.C @@ -2,12 +2,13 @@ // { dg-do run } extern "C" void abort(); -bool ok; + +int last = 4; struct A { int i; A(int i): i(i) { } - ~A() { if (!ok) abort(); } + ~A() { if (i > last) abort(); last = i; } }; struct D { int i; }; @@ -25,5 +26,4 @@ struct C int main() { C c = { 1, B(2), E(3) }; - ok = true; } |