aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2012-08-02 21:54:43 +0200
committerMarc Glisse <glisse@gcc.gnu.org>2012-08-02 19:54:43 +0000
commit77b5132f66c51aa41245f9b9f110141bd1629df5 (patch)
tree9870c86ac51cc17871ae568aecaada69d0859f38
parentc2381fb2f0715cf5f0f313bc0766d73c2f7b99e7 (diff)
downloadgcc-77b5132f66c51aa41245f9b9f110141bd1629df5.zip
gcc-77b5132f66c51aa41245f9b9f110141bd1629df5.tar.gz
gcc-77b5132f66c51aa41245f9b9f110141bd1629df5.tar.bz2
re PR tree-optimization/53805 (combine_comparisons changes trapping behavior)
2012-08-02 Marc Glisse <marc.glisse@inria.fr> PR tree-optimization/53805 * gcc/fold-const.c (invert_tree_comparison): Invert ORDERED_EXPR and UNORDERED_EXPR even for trapping floating point. * gcc/testsuite/gcc.dg/fold-notunord.c: New testcase. From-SVN: r190100
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/fold-const.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/fold-notunord.c10
4 files changed, 25 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6839fda..d092918 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-02 Marc Glisse <marc.glisse@inria.fr>
+
+ PR tree-optimization/53805
+ * fold-const.c (invert_tree_comparison): Invert ORDERED_EXPR and
+ UNORDERED_EXPR even for trapping floating point.
+
2012-08-02 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/53321
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index c136960..dfc01cc 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -2094,12 +2094,14 @@ pedantic_non_lvalue_loc (location_t loc, tree x)
/* Given a tree comparison code, return the code that is the logical inverse.
It is generally not safe to do this for floating-point comparisons, except
- for EQ_EXPR and NE_EXPR, so we return ERROR_MARK in this case. */
+ for EQ_EXPR, NE_EXPR, ORDERED_EXPR and UNORDERED_EXPR, so we return
+ ERROR_MARK in this case. */
enum tree_code
invert_tree_comparison (enum tree_code code, bool honor_nans)
{
- if (honor_nans && flag_trapping_math && code != EQ_EXPR && code != NE_EXPR)
+ if (honor_nans && flag_trapping_math && code != EQ_EXPR && code != NE_EXPR
+ && code != ORDERED_EXPR && code != UNORDERED_EXPR)
return ERROR_MARK;
switch (code)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4198578..8ef8e78 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-02 Marc Glisse <marc.glisse@inria.fr>
+
+ PR tree-optimization/53805
+ * gcc.dg/fold-notunord.c: New testcase.
+
2012-08-02 Mikael Morin <mikael@gcc.gnu.org>
PR fortran/48820
diff --git a/gcc/testsuite/gcc.dg/fold-notunord.c b/gcc/testsuite/gcc.dg/fold-notunord.c
new file mode 100644
index 0000000..edfe3cd
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/fold-notunord.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O -ftrapping-math -fdump-tree-optimized" } */
+
+int f (double d)
+{
+ return !__builtin_isnan (d);
+}
+
+/* { dg-final { scan-tree-dump " ord " "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */