+ * g++.dg/tm/pr47530-2.C: Adjust for uninstrumented code path.

+       * g++.dg/tm/pr47530-2.C: Adjust for uninstrumented code path.
+       * g++.dg/tm/pr47530.C: Same.

From-SVN: r193372

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e888313..fa0919e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-09  Aldy Hernandez  <aldyh@redhat.com>
+
+       * g++.dg/tm/pr47530-2.C: Adjust for uninstrumented code path.
+       * g++.dg/tm/pr47530.C: Same.
+
 2012-11-09  Jason Merrill  <jason@redhat.com>
 
        PR c++/54859

diff --git a/gcc/testsuite/g++.dg/tm/pr47530-2.C b/gcc/testsuite/g++.dg/tm/pr47530-2.C
index c98e07e..bcfdbe9 100644 (file)
--- a/gcc/testsuite/g++.dg/tm/pr47530-2.C
+++ b/gcc/testsuite/g++.dg/tm/pr47530-2.C
@@ -31,5 +31,9 @@ void bench_test()
     }
 }
 
-// { dg-final { scan-tree-dump-times "ITM_commitTransaction.*tail call" 0 "tmedge" } }
+// There should be two calls to commitTransaction.
+// The one in the uninstrumented code path is a tail call.
+// The one in the instrumented code path is not.
+// { dg-final { scan-tree-dump-times "ITM_commitTransaction.*tail call" 1 "tmedge" } }
+
 // { dg-final { cleanup-tree-dump "tmedge" } }

diff --git a/gcc/testsuite/g++.dg/tm/pr47530.C b/gcc/testsuite/g++.dg/tm/pr47530.C
index 8e7e272..6a9fb1b 100644 (file)
--- a/gcc/testsuite/g++.dg/tm/pr47530.C
+++ b/gcc/testsuite/g++.dg/tm/pr47530.C
@@ -73,7 +73,8 @@ void LinkedList::insert(int val)
   }
 }
 
-// Make sure we don't do tail optimization on the commit.
-// { dg-final { scan-tree-dump-times "commitTransaction...; .tail call" 0 "optimized" } }
+// Make sure we don't do tail optimization on the commit, except on
+// the uninstrumented code path.
+// { dg-final { scan-tree-dump-times "commitTransaction...; .tail call" 1 "optimized" } }
 // { dg-final { cleanup-tree-dump "optimized" } }