Now that we have two code paths, the testsuite needs to be adjusted.
Committed as obvious.
commit 1cfee58f7559592cc21e8c68754a1c0093c5876d
Author: Aldy Hernandez <al...@redhat.com>
Date: Fri Nov 9 12:42:00 2012 -0600
+ * g++.dg/tm/pr47530-2.C: Adjust for uninstrumented code path.
+ * g++.dg/tm/pr47530.C: Same.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e888313..fa0919e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-09 Aldy Hernandez <al...@redhat.com>
+
+ * g++.dg/tm/pr47530-2.C: Adjust for uninstrumented code path.
+ * g++.dg/tm/pr47530.C: Same.
+
2012-11-09 Jason Merrill <ja...@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
--- 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
--- 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" } }
