re PR testsuite/91458 (FAIL: g++.dg/tree-ssa/pr19807.C -std=gnu++98 scan-tree-dump...

PR testsuite/91458

gcc/testsuite/ChangeLog:
	* g++.dg/tree-ssa/ssa-dse-1.C: Use the same search pattern
	unconditionally (correcting r272199, PR middle-end/90676).
	* gcc.dg/tree-prof/stringop-2.c: Same.

From-SVN: r274764

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2e361d303503e74308b85637015fbeeb7582a214..3187e94186d4711f7156332a8a4554bfe1f87286 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-08-20  Martin Sebor  <msebor@redhat.com>
+
+       PR testsuite/91458
+       * g++.dg/tree-ssa/ssa-dse-1.C: Use the same search pattern
+       unconditionally (correcting r272199, PR middle-end/90676).
+       * gcc.dg/tree-prof/stringop-2.c: Same.
+
 2019-08-20  Ian Lance Taylor  <iant@golang.org>
 
        * go.test/test/fixedbugs/bug073.go: Update for language changes.

diff --git a/gcc/testsuite/g++.dg/tree-ssa/ssa-dse-1.C b/gcc/testsuite/g++.dg/tree-ssa/ssa-dse-1.C
index bed4886dc14c9214a4d24463b9529ac019637cf0..65f7ddb8cf00b42b8623b6fd9e6be0b3836ad10a 100644 (file)
--- a/gcc/testsuite/g++.dg/tree-ssa/ssa-dse-1.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/ssa-dse-1.C
@@ -97,5 +97,4 @@ int main()
 }
 
 
-/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct FixBuf \\*\\)&<retval> \\+ \[0-9\]+B\\\] = {}" 1 "dse1" { target { ! store_merge } } } }
-   { dg-final { scan-tree-dump-times "MEM <char\\\[\[0-9\]+]> \\\[\\(struct FixBuf \\*\\)&<retval> \\+ \[0-9\]+B\\\] = {}" 1 "dse1" { target { store_merge } } } } */
+/* { dg-final { scan-tree-dump-times "MEM <char\\\[\[0-9\]+]> \\\[\\(struct FixBuf \\*\\)&<retval> \\+ \[0-9\]+B\\\] = {}" 1 "dse1" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c b/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c
index 0264bb37c9cca94090a1dec6856cce3f2d16fdb6..b7471bffd9159e560543646e0a6e66ecd00bd6ef 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c
@@ -22,5 +22,4 @@ main()
 /* autofdo doesn't support value profiling for now: */
 /* { dg-final-use-not-autofdo { scan-ipa-dump "Transformation done: single value 4 stringop" "profile"} } */
 /* The versioned memset of size 4 should be optimized to an assignment.
-   { dg-final-use-not-autofdo { scan-tree-dump "MEM\\\[\\(void .\\)&a\\\] = 168430090" "optimized" { target { ! store_merge } } } }
-   { dg-final-use-not-autofdo { scan-tree-dump "MEM <\[a-z \]+> \\\[\\(void .\\)&a\\\] = 168430090" "optimized" { target { store_merge } } } } */
+   { dg-final-use-not-autofdo { scan-tree-dump "MEM <\[a-z \]+> \\\[\\(void .\\)&a\\\] = 168430090" "optimized" } } */