re PR middle-end/25568 (RTL checking bootstrap failure on i686-unknown-linux-gnu)

       PR middle-end/25568
       * combine.c (simplify_shift_const_1 <case PLUS>):Fix enable-checking
       rtl bootstrap failure.

From-SVN: r109064

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8433c93bb3db27103d76b894161bd44685820938..71807d72eaccbc27c8ffc34afd4882e6e304cb98 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-26  Graham Stott  <graham.stott@btinternet.com>
+
+       PR middle-end/25568
+       * combine.c (simplify_shift_const_1 <case PLUS>):Fix enable-checking
+       rtl bootstrap failure.
+
 2005-12-25  Kazu Hirata  <kazu@codesourcery.com>
 
        * final.c (compute_alignments): Make it static.

diff --git a/gcc/combine.c b/gcc/combine.c
index 2482bbd26e9a5e0cee224f7d496fbf5962ccfcf0..1361b10d27c04c83d237cdd8e6e8e0af5fe1e373 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -8919,6 +8919,7 @@ simplify_shift_const_1 (enum rtx_code code, enum machine_mode result_mode,
              && (new = simplify_const_binary_operation (ASHIFT, result_mode,
                                                         XEXP (varop, 1),
                                                         GEN_INT (count))) != 0
+             && GET_CODE (new) == CONST_INT
              && merge_outer_ops (&outer_op, &outer_const, PLUS,
                                  INTVAL (new), result_mode, &complement_p))
            {
@@ -8937,6 +8938,7 @@ simplify_shift_const_1 (enum rtx_code code, enum machine_mode result_mode,
              && (new = simplify_const_binary_operation (code, result_mode,
                                                         XEXP (varop, 1),
                                                         GEN_INT (count))) != 0
+             && GET_CODE (new) == CONST_INT
              && merge_outer_ops (&outer_op, &outer_const, XOR,
                                  INTVAL (new), result_mode, &complement_p))
            {