summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2005-12-02 09:38:57 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2005-12-02 09:38:57 +0000
commite7a6c1272ccfdeb0d21001de0f2cbd442d6b0af9 (patch)
treeaf41320d443287e283275d32d2c1db0df88fdb0f
parentde3d4fc2dacc9d39ab40bf03e8d5ec47d218cdfd (diff)
downloadgcc-e7a6c1272ccfdeb0d21001de0f2cbd442d6b0af9.tar.gz
convert.c (convert_to_integer): Use fold_convert instead of fold_build1 (NOP_EXPR, ...).
2005-12-02 Richard Guenther <rguenther@suse.de> * convert.c (convert_to_integer): Use fold_convert instead of fold_build1 (NOP_EXPR, ...). Use tree_int_cst_sgn < 0 instead of comparing against 0. Use build_int_cst instead of converting integer_zero_node. From-SVN: r107881
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/convert.c8
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8ff5710e8f..b521d3f506c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
2005-12-02 Richard Guenther <rguenther@suse.de>
+ * convert.c (convert_to_integer): Use fold_convert instead
+ of fold_build1 (NOP_EXPR, ...). Use tree_int_cst_sgn < 0
+ instead of comparing against 0. Use build_int_cst instead
+ of converting integer_zero_node.
+
+2005-12-02 Richard Guenther <rguenther@suse.de>
+
* tree-pretty-print.c (op_symbol): Handle LROTATE_EXPR
and RROTATE_EXPR.
diff --git a/gcc/convert.c b/gcc/convert.c
index beebf047b78..ece3637e93d 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -420,7 +420,7 @@ convert_to_integer (tree type, tree expr)
expr = fold_build1 (CONVERT_EXPR,
lang_hooks.types.type_for_size (POINTER_SIZE, 0),
expr);
- return fold_build1 (NOP_EXPR, type, expr);
+ return fold_convert (type, expr);
case INTEGER_TYPE:
case ENUMERAL_TYPE:
@@ -500,9 +500,7 @@ convert_to_integer (tree type, tree expr)
/* We can pass truncation down through right shifting
when the shift count is a nonpositive constant. */
if (TREE_CODE (TREE_OPERAND (expr, 1)) == INTEGER_CST
- && tree_int_cst_lt (TREE_OPERAND (expr, 1),
- convert (TREE_TYPE (TREE_OPERAND (expr, 1)),
- integer_one_node)))
+ && tree_int_cst_sgn (TREE_OPERAND (expr, 1)) < 0)
goto trunc1;
break;
@@ -528,7 +526,7 @@ convert_to_integer (tree type, tree expr)
but (int) a << 32 is undefined and would get a
warning. */
- tree t = convert_to_integer (type, integer_zero_node);
+ tree t = build_int_cst (type, 0);
/* If the original expression had side-effects, we must
preserve it. */