* g++.dg/eh/init-temp1.C: Improve test.

From-SVN: r152341

2 files changed, 22 insertions, 8 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c3ca43..61d402a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-30  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/eh/init-temp1.C: Improve test.
+
 2009-09-30  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/22093
diff --git a/gcc/testsuite/g++.dg/eh/init-temp1.C b/gcc/testsuite/g++.dg/eh/init-temp1.C
index 29eae69..529014f 100644
--- a/gcc/testsuite/g++.dg/eh/init-temp1.C
+++ b/gcc/testsuite/g++.dg/eh/init-temp1.C
@@ -1,19 +1,24 @@
 // PR c++/15764
+// { dg-do run }
 
 extern "C" void abort (); 
  
-int counter = 0; 
 int thrown; 
-struct a { 
-  ~a () { if (thrown++ == 0) throw 42; } 
+
+int as;
+struct a {
+  a () { ++as; }
+  ~a () { --as; if (thrown++ == 0) throw 42; }
 }; 
  
 int f (a const&) { return 1; } 
 int f (a const&, a const&) { return 1; } 
- 
+
+int bs;
+int as_sav;
 struct b { 
-  b (...) { ++counter; } 
-  ~b ()   { --counter; } 
+  b (...) { ++bs; }
+  ~b ()   { --bs; as_sav = as; }
 }; 
 
 bool p;
@@ -29,7 +34,12 @@ int main () {
 
     g();
   }  
-  catch (...) {} 
+  catch (...) {}
+
+  // We throw when the first a is destroyed, which should destroy b before
+  // the other a.
+  if (as_sav != 1)
+    abort ();
 
   thrown = 0;
   try {
@@ -39,6 +49,6 @@ int main () {
   }  
   catch (...) {} 
  
-  if (counter != 0) 
+  if (bs != 0)
     abort (); 
 }