re PR tree-optimization/81184 (gcc.dg/pr21643.c and gcc.dg/tree-ssa/phi-opt-11.c...

	PR tree-optimization/81184
	* gcc.dg/pr21643.c: Adjust dg-final line for logical_op_short_circuit
	targets.
	* gcc.dg/tree-ssa/phi-opt-11.c: Likewise.

From-SVN: r256780

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5401be1..448b44a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,11 @@
-2018-01-16  Eric Botcazou  <ebotcazou@adacore.com>
+2018-01-17  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR tree-optimization/81184
+       * gcc.dg/pr21643.c: Adjust dg-final line for logical_op_short_circuit
+       targets.
+       * gcc.dg/tree-ssa/phi-opt-11.c: Likewise.
+
+2018-01-17  Eric Botcazou  <ebotcazou@adacore.com>
 
        * c-c++-common/Wrestrict.c (test_strcpy_range): Revert latest change.
 

diff --git a/gcc/testsuite/gcc.dg/pr21643.c b/gcc/testsuite/gcc.dg/pr21643.c
index d981fbc..8a72165 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr21643.c
+++ b/gcc/testsuite/gcc.dg/pr21643.c
@@ -87,4 +87,5 @@ f9 (unsigned char c)
   return 1;
 }
 
-/* { dg-final { scan-tree-dump-times "Optimizing range tests c_\[0-9\]*.D. -.0, 31. and -.32, 32.\[\n\r\]* into" 6 "reassoc1" } } */
+/* { dg-final { scan-tree-dump-times "Optimizing range tests c_\[0-9\]*.D. -.0, 31. and -.32, 32.\[\n\r\]* into" 6 "reassoc1" { target { ! logical_op_short_circuit } } } }  */
+/* { dg-final { scan-tree-dump-times "Optimizing range tests c_\[0-9\]*.D. -.0, 31. and -.32, 32.\[\n\r\]* into" 5 "reassoc1" { target logical_op_short_circuit } } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c
index 20728fc..1d06be0 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c
@@ -22,4 +22,6 @@ int h(int a, int b, int c, int d)
    return d;
  return a;
 }
-/* { dg-final { scan-tree-dump-times "if" 0 "optimized"} } */
+
+/* { dg-final { scan-tree-dump-times "if" 0 "optimized" { target { ! logical_op_short_circuit } } } } */
+/* { dg-final { scan-tree-dump-times "if" 2 "optimized" { target logical_op_short_circuit } } } */