Patchwork C++ PATCH for c++/48370 (extending lifetime of temps in aggregate initialization)

login
register
mail settings
Submitter Jason Merrill
Date Nov. 5, 2011, 3:23 a.m.
Message ID <4EB4AC1D.9040303@redhat.com>
Download mbox | patch
Permalink /patch/123815/
State New
Headers show

Comments

Jason Merrill - Nov. 5, 2011, 3:23 a.m.
While working on a followup, I noticed that this patch runs temporary 
cleanups in the wrong order.  Fixed (and tested) thus.

Tested x86_64-pc-linux-gnu, applying to trunk.

Patch

commit 376093f30953db1fc7b4537f7ca9253dea91c8a3
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Nov 4 16:32:47 2011 -0400

    	PR c++/48370
    	* decl.c (cp_finish_decl): Run cleanups in the right order.

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/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;
 }