2006-06-19 Richard Guenther <rguenther@suse.de>

	* tree-ssa-pre.c (try_combine_conversion): Strip useless
	type conversions after folding.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114784 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 50d8902..81535ec 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-19  Richard Guenther  <rguenther@suse.de>
 
+       * tree-ssa-pre.c (try_combine_conversion): Strip useless
+       type conversions after folding.
+
+2006-06-19  Richard Guenther  <rguenther@suse.de>
+
        * ggc-page.c (extra_order_size_tab): Add entries with
        size of struct function and basic_block.
        (size_lookup): Extend to cover sizes up to 511.

diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 7ae481b..54c6eb3 100644 (file)
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -3330,12 +3330,17 @@ try_combine_conversion (tree *expr_p)
 
   t = fold_unary (TREE_CODE (expr), TREE_TYPE (expr),
                  VALUE_HANDLE_EXPR_SET (TREE_OPERAND (expr, 0))->head->expr);
+  if (!t)
+    return false;
+
+  /* Strip useless type conversions, which is safe in the optimizers but
+     not generally in fold.  */
+  STRIP_USELESS_TYPE_CONVERSION (t);
 
   /* Disallow value expressions we have no value number for already, as
      we would miss a leader for it here.  */
-  if (t
-      && !(TREE_CODE (t) == VALUE_HANDLE
-          || is_gimple_min_invariant (t)))
+  if (!(TREE_CODE (t) == VALUE_HANDLE
+       || is_gimple_min_invariant (t)))
     t = vn_lookup (t, NULL);
 
   if (t && t != expr)