patch to fix constant math - third patch - what is left for next stage 1

[Kenneth Zadeck <zadeck at naturalbridge dot com>]

the original patch 3 was accepted and committed.   These were subsequent 
comments.   This could likely be just checked in the next stage 1 
without approval.



diff --git a/gcc/combine.c b/gcc/combine.c
index acb7421..98ca4a8 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -2635,11 +2635,6 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx i0, int *new_direct_jump_p,
       int offset = -1;
       int width = 0;
       
-      /* There are not explicit tests to make sure that this is not a
-	 float, but there is code here that would not be correct if it
-	 was.  */
-      gcc_assert (GET_MODE_CLASS (GET_MODE (SET_SRC (temp))) != MODE_FLOAT);
-
       if (GET_CODE (dest) == ZERO_EXTRACT)
 	{
 	  if (CONST_INT_P (XEXP (dest, 1))
diff --git a/gcc/cselib.c b/gcc/cselib.c
index f2021b9..dcad9741 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -1026,7 +1026,7 @@ rtx_equal_for_cselib_1 (rtx x, rtx y, enum machine_mode memmode)
 static rtx
 wrap_constant (enum machine_mode mode, rtx x)
 {
-  if ((!CONST_SCALAR_INT_P (x)) && GET_CODE (x) != CONST_FIXED)
+  if (!CONST_SCALAR_INT_P (x) && GET_CODE (x) != CONST_FIXED)
     return x;
   gcc_assert (mode != VOIDmode);
   return gen_rtx_CONST (mode, x);

Attachment: p3-2.clog
Description: Text document