From: msebor <msebor@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 21 Aug 2019 02:18:41 +0000 (+0000)
Subject: PR testsuite/91458
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3644b5e53b5cb3f9e021ab07150f393e7a7be3f;p=thirdparty%2Fgcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@274764 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2e361d303503..3187e94186d4 100644
--- 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 bed4886dc14c..65f7ddb8cf00 100644
--- 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 0264bb37c9cc..b7471bffd915 100644
--- 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" } } */