From 01a097e8ec830c49674e24862d16e101c43c8932 Mon Sep 17 00:00:00 2001 From: Graham Stott Date: Mon, 26 Dec 2005 18:58:56 +0000 Subject: [PATCH] re PR middle-end/25568 (RTL checking bootstrap failure on i686-unknown-linux-gnu) PR middle-end/25568 * combine.c (simplify_shift_const_1 ):Fix enable-checking rtl bootstrap failure. From-SVN: r109064 --- gcc/ChangeLog | 6 ++++++ gcc/combine.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8433c93bb3d..71807d72eac 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-12-26 Graham Stott + + PR middle-end/25568 + * combine.c (simplify_shift_const_1 ):Fix enable-checking + rtl bootstrap failure. + 2005-12-25 Kazu Hirata * final.c (compute_alignments): Make it static. diff --git a/gcc/combine.c b/gcc/combine.c index 2482bbd26e9..1361b10d27c 100644 --- 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)) { -- 2.30.2