tree-scalar-evolution.c (set_nb_iterations_in_loop): Only check for TREE_OVERFLOW...

	* tree-scalar-evolution.c (set_nb_iterations_in_loop): Only
	check for TREE_OVERFLOW on INTEGER_CST trees.
	* tree-chrec.c (chrec_convert): Only clear TREE_OVERFLOW on
	CONSTANT_CLASS_P tree nodes.

From-SVN: r99765

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0f039ae37cf3db2d1457560ec1260aa11cccf20..ce284d11cf509811a159724638a1776fd3aff70e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-15  Roger Sayle  <roger@eyesopen.com>
+
+       * tree-scalar-evolution.c (set_nb_iterations_in_loop): Only
+       check for TREE_OVERFLOW on INTEGER_CST trees.
+       * tree-chrec.c (chrec_convert): Only clear TREE_OVERFLOW on
+       CONSTANT_CLASS_P tree nodes.
+
 2005-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR target/21551

diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index 967a3cd8158d6653e443d138b3796b1c2102456e..cb72df0aad380aaa78e9ea0577110a7d1bf48502 100644 (file)
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -1062,9 +1062,11 @@ chrec_convert (tree type,
        tree res = fold_convert (type, chrec);
 
        /* Don't propagate overflows.  */
-       TREE_OVERFLOW (res) = 0;
        if (CONSTANT_CLASS_P (res))
-         TREE_CONSTANT_OVERFLOW (res) = 0;
+         {
+           TREE_CONSTANT_OVERFLOW (res) = 0;
+           TREE_OVERFLOW (res) = 0;
+         }
 
        /* But reject constants that don't fit in their type after conversion.
           This can happen if TYPE_MIN_VALUE or TYPE_MAX_VALUE are not the

diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index e0ef0ee33084fe1cec22458feff3236cea4e9d01..4019f78c0aeb511de65cc0449db5d38231ffd6b6 100644 (file)
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -922,8 +922,9 @@ set_nb_iterations_in_loop (struct loop *loop,
      count of the loop in order to be compatible with the other
      nb_iter computations in loop-iv.  This also allows the
      representation of nb_iters that are equal to MAX_INT.  */
-  if ((TREE_CODE (res) == INTEGER_CST && TREE_INT_CST_LOW (res) == 0)
-      || TREE_OVERFLOW (res))
+  if (TREE_CODE (res) == INTEGER_CST
+      && (TREE_INT_CST_LOW (res) == 0
+         || TREE_OVERFLOW (res)))
     res = chrec_dont_know;
   
   if (dump_file && (dump_flags & TDF_DETAILS))