From 76288c9ae6793fae67779f28de294d908a0fb917 Mon Sep 17 00:00:00 2001 From: rguenth Date: Fri, 27 May 2011 10:32:14 +0000 Subject: 2011-05-27 Richard Guenther PR middle-end/49177 * fold-const.c (fold_unary_loc): Fold (T)(A CMP B) to A CMP B ? (T) true : (T) false for non-integral types T again. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174326 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fold-const.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gcc/fold-const.c') diff --git a/gcc/fold-const.c b/gcc/fold-const.c index c9c7afa068b..ebb1d34d5f4 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -7657,11 +7657,19 @@ fold_unary_loc (location_t loc, enum tree_code code, tree type, tree op0) if (TREE_TYPE (op0) == type) return op0; - /* If we have (type) (a CMP b) and type is an integral type, return - new expression involving the new type. */ - if (COMPARISON_CLASS_P (op0) && INTEGRAL_TYPE_P (type)) - return fold_build2_loc (loc, TREE_CODE (op0), type, TREE_OPERAND (op0, 0), - TREE_OPERAND (op0, 1)); + if (COMPARISON_CLASS_P (op0)) + { + /* If we have (type) (a CMP b) and type is an integral type, return + new expression involving the new type. */ + if (INTEGRAL_TYPE_P (type)) + return fold_build2_loc (loc, TREE_CODE (op0), type, + TREE_OPERAND (op0, 0), + TREE_OPERAND (op0, 1)); + else + return fold_build3_loc (loc, COND_EXPR, type, op0, + fold_convert (type, boolean_true_node), + fold_convert (type, boolean_false_node)); + } /* Handle cases of two conversions in a row. */ if (CONVERT_EXPR_P (op0)) -- cgit v1.2.1