tree-ssa-dom.c (simplify_rhs_and_lookup_avail_expr): Don't fold fp plus with minus.

        * tree-ssa-dom.c (simplify_rhs_and_lookup_avail_expr): Don't fold
        fp plus with minus.

From-SVN: r84061

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c
new file mode 100644 (file)
index 0000000..8f6ae16
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-dom2" } */
+
+float foo(float x)
+{
+  x += 1;
+  x -= 1;
+  return x;
+}
+
+/* We should *not* fold the arithmetic.  */
+/* { dg-final { scan-tree-dump-times "0.0" 0 "dom2"} } */

diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index b556b4eedf2440d1a8bf7cabffadb9cde46ad664..356daacb21c08c1e6f672e2ded582701bbf16bb3 100644 (file)
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -1945,6 +1945,25 @@ simplify_rhs_and_lookup_avail_expr (struct dom_walk_data *walk_data,
                  tree type = TREE_TYPE (TREE_OPERAND (stmt, 0));
                  tree t;
 
+                 /* If we care about correct floating point results, then
+                    don't fold x + c1 - c2.  Note that we need to take both
+                    the codes and the signs to figure this out.  */
+                 if (FLOAT_TYPE_P (type)
+                     && !flag_unsafe_math_optimizations
+                     && (rhs_def_code == PLUS_EXPR
+                         || rhs_def_code == MINUS_EXPR))
+                   {
+                     bool neg = false;
+
+                     neg ^= (rhs_code == MINUS_EXPR);
+                     neg ^= (rhs_def_code == MINUS_EXPR);
+                     neg ^= real_isneg (TREE_REAL_CST_PTR (outer_const));
+                     neg ^= real_isneg (TREE_REAL_CST_PTR (def_stmt_op1));
+
+                     if (neg)
+                       goto dont_fold_assoc;
+                   }
+
                  /* Ho hum.  So fold will only operate on the outermost
                     thingy that we give it, so we have to build the new
                     expression in two pieces.  This requires that we handle
@@ -1979,6 +1998,7 @@ simplify_rhs_and_lookup_avail_expr (struct dom_walk_data *walk_data,
                }
            }
        }
+ dont_fold_assoc:;
     }
 
   /* Transform TRUNC_DIV_EXPR and TRUNC_MOD_EXPR into RSHIFT_EXPR