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

login
register
mail settings
Submitter Kenneth Zadeck
Date Feb. 27, 2013, 12:37 a.m.
Message ID <512D5535.4010908@naturalbridge.com>
Download mbox | patch
Permalink /patch/223438/
State New
Headers show

Comments

Kenneth Zadeck - Feb. 27, 2013, 12:37 a.m.
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.
2013-2-26  Kenneth Zadeck <zadeck@naturalbridge.com>

	* combine.c (try_combine): Removed useless assert. 
	* cselib.c (rtx_equal_for_cselib_1): Removed unnecessary parens.
Richard Guenther - March 27, 2013, 2:19 p.m.
On Wed, Feb 27, 2013 at 1:37 AM, Kenneth Zadeck
<zadeck@naturalbridge.com> wrote:
> 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.

Ok.

Thanks,
Richard.

>
>
Kenneth Zadeck - March 28, 2013, 2:10 p.m.
committed as revision 197198

kenny
On 03/27/2013 10:19 AM, Richard Biener wrote:
> On Wed, Feb 27, 2013 at 1:37 AM, Kenneth Zadeck
> <zadeck@naturalbridge.com> wrote:
>> 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.
> Ok.
>
> Thanks,
> Richard.
>
>>

Patch

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);