From: rguenth Date: Mon, 15 Aug 2011 15:01:33 +0000 (+0000) Subject: 2011-08-15 Richard Guenther X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=0a3b59126cc532673941ff1718249524ae20ef73 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177762 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de1298c4fb4..952310748c0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 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. (extract_range_from_unary_expr_1): Restructure. 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;