From 5c0f009c926cc78fb15f1c5cfa46071a4359c9e9 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Tue, 13 May 2014 13:51:32 +0000 Subject: [PATCH] fold-const.c (optimize_bit_field_compare): Use wi:: operations instead of const_binop. gcc/ * fold-const.c (optimize_bit_field_compare): Use wi:: operations instead of const_binop. (fold_binary_loc): Likewise. From-SVN: r210378 --- gcc/ChangeLog | 6 ++++++ gcc/fold-const.c | 24 ++++++++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 972a783b3a7..0561b7b594e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-05-13 Richard Sandiford + + * fold-const.c (optimize_bit_field_compare): Use wi:: operations + instead of const_binop. + (fold_binary_loc): Likewise. + 2014-05-13 Richard Sandiford * tree-dfa.h (get_addr_base_and_unit_offset_1): Update array index diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 0fcb87fc025..5e064dfa98c 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -3444,7 +3444,7 @@ optimize_bit_field_compare (location_t loc, enum tree_code code, { HOST_WIDE_INT lbitpos, lbitsize, rbitpos, rbitsize, nbitpos, nbitsize; tree type = TREE_TYPE (lhs); - tree signed_type, unsigned_type; + tree unsigned_type; int const_p = TREE_CODE (rhs) == INTEGER_CST; enum machine_mode lmode, rmode, nmode; int lunsignedp, runsignedp; @@ -3489,7 +3489,6 @@ optimize_bit_field_compare (location_t loc, enum tree_code code, /* Set signed and unsigned types of the precision of this mode for the shifts below. */ - signed_type = lang_hooks.types.type_for_mode (nmode, 0); unsigned_type = lang_hooks.types.type_for_mode (nmode, 1); /* Compute the bit position and size for the new reference and our offset @@ -3538,10 +3537,7 @@ optimize_bit_field_compare (location_t loc, enum tree_code code, if (lunsignedp) { - if (! integer_zerop (const_binop (RSHIFT_EXPR, - fold_convert_loc (loc, - unsigned_type, rhs), - size_int (lbitsize)))) + if (wi::lrshift (rhs, lbitsize) != 0) { warning (0, "comparison is always %d due to width of bit-field", code == NE_EXPR); @@ -3550,10 +3546,8 @@ optimize_bit_field_compare (location_t loc, enum tree_code code, } else { - tree tem = const_binop (RSHIFT_EXPR, - fold_convert_loc (loc, signed_type, rhs), - size_int (lbitsize - 1)); - if (! integer_zerop (tem) && ! integer_all_onesp (tem)) + wide_int tem = wi::arshift (rhs, lbitsize - 1); + if (tem != 0 && tem != -1) { warning (0, "comparison is always %d due to width of bit-field", code == NE_EXPR); @@ -10356,9 +10350,8 @@ fold_binary_loc (location_t loc, && TREE_CODE (arg1) == BIT_AND_EXPR && TREE_CODE (TREE_OPERAND (arg0, 1)) == INTEGER_CST && TREE_CODE (TREE_OPERAND (arg1, 1)) == INTEGER_CST - && integer_zerop (const_binop (BIT_AND_EXPR, - TREE_OPERAND (arg0, 1), - TREE_OPERAND (arg1, 1)))) + && wi::bit_and (TREE_OPERAND (arg0, 1), + TREE_OPERAND (arg1, 1)) == 0) { code = BIT_IOR_EXPR; goto bit_ior; @@ -11478,9 +11471,8 @@ fold_binary_loc (location_t loc, && TREE_CODE (arg1) == BIT_AND_EXPR && TREE_CODE (TREE_OPERAND (arg0, 1)) == INTEGER_CST && TREE_CODE (TREE_OPERAND (arg1, 1)) == INTEGER_CST - && integer_zerop (const_binop (BIT_AND_EXPR, - TREE_OPERAND (arg0, 1), - TREE_OPERAND (arg1, 1)))) + && wi::bit_and (TREE_OPERAND (arg0, 1), + TREE_OPERAND (arg1, 1)) == 0) { code = BIT_IOR_EXPR; goto bit_ior;