From 46ba991f5433df738839061af7533a65b5cbd284 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 17 Jan 2018 11:03:00 +0000 Subject: [PATCH] re PR tree-optimization/81184 (gcc.dg/pr21643.c and gcc.dg/tree-ssa/phi-opt-11.c fail starting with r249450) 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 --- gcc/testsuite/ChangeLog | 9 ++++++++- gcc/testsuite/gcc.dg/pr21643.c | 3 ++- gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5401be1..448b44a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,11 @@ -2018-01-16 Eric Botcazou +2018-01-17 Eric Botcazou + + 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 * 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 --- 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 --- 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 } } } */ -- 2.7.4