combine.c (simplify_if_then_else): Don't convert a == b ? b ...

	* combine.c (simplify_if_then_else): Don't convert a == b ? b : a
	to a if the comparison is floating mode and not -ffast-math.
	* simplify-rtx.c (simplify_ternary_operation): Likewise.

From-SVN: r36326

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0aa4fd4b8604e4fb72828e11b7c11d6076096ec2..dd8593e88a1822f272d16bb0456b27a7569d25f3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-11  Jakub Jelinek  <jakub@redhat.com>
+
+       * combine.c (simplify_if_then_else): Don't convert a == b ? b : a
+       to a if the comparison is floating mode and not -ffast-math.
+       * simplify-rtx.c (simplify_ternary_operation): Likewise.
+
 Mon Sep 11 20:07:48 2000  J"orn Rennecke <amylaar@redhat.co.uk>
 
        * sh.h (INITIALIZE_TRAMPOLINE): Remove stray call to

diff --git a/gcc/combine.c b/gcc/combine.c
index 053b42060ce246d39590e7350c207468fd7b1935..478aab2b2a30d166626567c913864703cd7055e8 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -4703,10 +4703,12 @@ simplify_if_then_else (x)
 
   /* Convert a == b ? b : a to "a".  */
   if (true_code == EQ && ! side_effects_p (cond)
+      && (! FLOAT_MODE_P (mode) || flag_fast_math)
       && rtx_equal_p (XEXP (cond, 0), false)
       && rtx_equal_p (XEXP (cond, 1), true))
     return false;
   else if (true_code == NE && ! side_effects_p (cond)
+          && (! FLOAT_MODE_P (mode) || flag_fast_math)
           && rtx_equal_p (XEXP (cond, 0), true)
           && rtx_equal_p (XEXP (cond, 1), false))
     return true;

diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 701b7ba17216d20f4a4868a41512af52785018db..0091d727092d96845e90afca2eb2145180795a24 100644 (file)
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -1976,10 +1976,12 @@ simplify_ternary_operation (code, mode, op0_mode, op0, op1, op2)
 
       /* Convert a == b ? b : a to "a".  */
       if (GET_CODE (op0) == NE && ! side_effects_p (op0)
+         && (! FLOAT_MODE_P (mode) || flag_fast_math)
          && rtx_equal_p (XEXP (op0, 0), op1)
          && rtx_equal_p (XEXP (op0, 1), op2))
        return op1;
       else if (GET_CODE (op0) == EQ && ! side_effects_p (op0)
+         && (! FLOAT_MODE_P (mode) || flag_fast_math)
          && rtx_equal_p (XEXP (op0, 1), op1)
          && rtx_equal_p (XEXP (op0, 0), op2))
        return op2;