From d510820a47f86a507ab6a450b681009f3f3aba99 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Mon, 15 Aug 2011 15:01:33 +0000 Subject: [PATCH] re PR tree-optimization/50082 (-Wstrict-overflow mishandles typedef) 2011-08-15 Richard Guenther PR middle-end/50082 * fold-const.c (maybe_canonicalize_comparison_1): Properly convert the modified operand to the other operand type. (fold_comparison): Call maybe_canonicalize_comparison_1 with useless conversions stripped from comparison operands. From-SVN: r177762 --- gcc/ChangeLog | 8 ++++++++ gcc/fold-const.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de1298c4fb4..952310748c0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-08-15 Richard Guenther + + PR middle-end/50082 + * fold-const.c (maybe_canonicalize_comparison_1): Properly + convert the modified operand to the other operand type. + (fold_comparison): Call maybe_canonicalize_comparison_1 with + useless conversions stripped from comparison operands. + 2011-08-15 Richard Guenther * tree-vrp.c (value_range_nonnegative_p): Fix anti-range case. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 6abce5924e9..9c389ccfe3e 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -8446,6 +8446,7 @@ maybe_canonicalize_comparison_1 (location_t loc, enum tree_code code, tree type, cst0, build_int_cst (TREE_TYPE (cst0), 1)); if (code0 != INTEGER_CST) t = fold_build2_loc (loc, code0, TREE_TYPE (arg0), TREE_OPERAND (arg0, 0), t); + t = fold_convert (TREE_TYPE (arg1), t); /* If swapping might yield to a more canonical form, do so. */ if (swap) @@ -8935,7 +8936,7 @@ fold_comparison (location_t loc, enum tree_code code, tree type, return fold_build2_loc (loc, cmp_code, type, variable1, const2); } - tem = maybe_canonicalize_comparison (loc, code, type, op0, op1); + tem = maybe_canonicalize_comparison (loc, code, type, arg0, arg1); if (tem) return tem;