2005-01-01 Daniel Berlin <dberlin@dberlin.org>

[pf3gnuchains/gcc-fork.git] / gcc / tree-vrp.c

diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index a9609fa..9254fbc 100644 (file)
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -1167,6 +1167,7 @@ static void
 extract_range_from_binary_expr (value_range_t *vr, tree expr)
 {
   enum tree_code code = TREE_CODE (expr);
+  enum value_range_type type;
   tree op0, op1, min, max;
   int cmp;
   value_range_t vr0 = { VR_UNDEFINED, NULL_TREE, NULL_TREE, NULL };
@@ -1220,6 +1221,9 @@ extract_range_from_binary_expr (value_range_t *vr, tree expr)
       return;
     }
 
+  /* The type of the resulting value range defaults to VR0.TYPE.  */
+  type = vr0.type;
+
   /* Refuse to operate on VARYING ranges, ranges of different kinds
      and symbolic ranges.  As an exception, we allow BIT_AND_EXPR
      because we may be able to derive a useful range even if one of
@@ -1417,7 +1421,7 @@ extract_range_from_binary_expr (value_range_t *vr, tree expr)
          && tree_expr_nonnegative_p (vr0.max)
          && TREE_CODE (vr0.max) == INTEGER_CST)
        {
-         min = fold_convert (TREE_TYPE (expr), integer_zero_node);
+         min = build_int_cst (TREE_TYPE (expr), 0);
          max = vr0.max;
        }
       else if (vr1.type == VR_RANGE
@@ -1425,8 +1429,8 @@ extract_range_from_binary_expr (value_range_t *vr, tree expr)
          && tree_expr_nonnegative_p (vr1.max)
          && TREE_CODE (vr1.max) == INTEGER_CST)
        {
-         vr0.type = VR_RANGE;
-         min = fold_convert (TREE_TYPE (expr), integer_zero_node);
+         type = VR_RANGE;
+         min = build_int_cst (TREE_TYPE (expr), 0);
          max = vr1.max;
        }
       else
@@ -1455,7 +1459,7 @@ extract_range_from_binary_expr (value_range_t *vr, tree expr)
       set_value_range_to_varying (vr);
     }
   else
-    set_value_range (vr, vr0.type, min, max, NULL);
+    set_value_range (vr, type, min, max, NULL);
 }