Replace uses of determine_value_range with range_of_expr.

The expression evaluator changes to the range_query API provide
everything determine_value_range does.  This patch replaces all uses
with calls into the range_query API.

gcc/ChangeLog:

	* calls.c (get_size_range): Use range_of_expr instead of
	determine_value_range.
	* tree-affine.c (expr_to_aff_combination): Same.
	* tree-data-ref.c (split_constant_offset): Same.
	* tree-vrp.c (determine_value_range_1): Remove.
	(determine_value_range): Remove.
	* tree-vrp.h (determine_value_range): Remove.

diff --git a/gcc/calls.c b/gcc/calls.c
index dd8ff2aa7cbb7260c9241e71101cf1f77c68d318..a7c78ed9c16a6622cc9682b2c3352ed01902ea73 100644 (file)
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -1276,19 +1276,20 @@ get_size_range (range_query *query, tree exp, gimple *stmt, tree range[2],
   wide_int min, max;
   enum value_range_kind range_type;
 
+  if (!query)
+    query = get_global_range_query ();
+
   if (integral)
     {
       value_range vr;
-      if (query && query->range_of_expr (vr, exp, stmt))
-       {
-         if (vr.undefined_p ())
-           vr.set_varying (TREE_TYPE (exp));
-         range_type = vr.kind ();
-         min = wi::to_wide (vr.min ());
-         max = wi::to_wide (vr.max ());
-       }
-      else
-       range_type = determine_value_range (exp, &min, &max);
+
+      query->range_of_expr (vr, exp, stmt);
+
+      if (vr.undefined_p ())
+       vr.set_varying (TREE_TYPE (exp));
+      range_type = vr.kind ();
+      min = wi::to_wide (vr.min ());
+      max = wi::to_wide (vr.max ());
     }
   else
     range_type = VR_VARYING;

diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c
index b273adb173de8653706ee9c9b7af02cae8b44934..a65719def23e7034766d30010e5f92465db16acc 100644 (file)
--- a/gcc/tree-affine.c
+++ b/gcc/tree-affine.c
@@ -31,6 +31,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimplify.h"
 #include "dumpfile.h"
 #include "cfgexpand.h"
+#include "value-query.h"
 
 /* Extends CST as appropriate for the affine combinations COMB.  */
 
@@ -345,11 +346,15 @@ expr_to_aff_combination (aff_tree *comb, tree_code code, tree type,
               for below case:
                 (T1)(X *+- CST) -> (T1)X *+- (T1)CST
               if X *+- CST doesn't overflow by range information.  */
+           value_range vr;
            if (TYPE_UNSIGNED (itype)
                && TYPE_OVERFLOW_WRAPS (itype)
                && TREE_CODE (op1) == INTEGER_CST
-               && determine_value_range (op0, &minv, &maxv) == VR_RANGE)
+               && get_range_query (cfun)->range_of_expr (vr, op0)
+               && vr.kind () == VR_RANGE)
              {
+               wide_int minv = vr.lower_bound ();
+               wide_int maxv = vr.upper_bound ();
                wi::overflow_type overflow = wi::OVF_NONE;
                signop sign = UNSIGNED;
                if (icode == PLUS_EXPR)

diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 09d466715655892992d28961f6f3775c384902de..b1f646848404c46a28f4a614fb03c6a075db26e4 100644 (file)
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -1069,12 +1069,12 @@ split_constant_offset (tree exp, tree *var, tree *off, value_range *exp_range,
   if (INTEGRAL_TYPE_P (type))
     *var = fold_convert (sizetype, *var);
   *off = ssize_int (0);
-  if (exp_range && code != SSA_NAME)
-    {
-      wide_int var_min, var_max;
-      if (determine_value_range (exp, &var_min, &var_max) == VR_RANGE)
-       *exp_range = value_range (type, var_min, var_max);
-    }
+
+  value_range r;
+  if (exp_range && code != SSA_NAME
+      && get_range_query (cfun)->range_of_expr (r, exp)
+      && !r.undefined_p ())
+    *exp_range = r;
 }
 
 /* Expresses EXP as VAR + OFF, where OFF is a constant.  VAR has the same

diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 450926d5f9bc89d21077f44e35a1d25f04b820b0..b9c0e65bd989379428ca5d0fdf1a30f11c7a1ca3 100644 (file)
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -4606,59 +4606,3 @@ make_pass_vrp (gcc::context *ctxt)
 {
   return new pass_vrp (ctxt);
 }
-
-
-/* Worker for determine_value_range.  */
-
-static void
-determine_value_range_1 (value_range *vr, tree expr)
-{
-  if (BINARY_CLASS_P (expr))
-    {
-      value_range vr0, vr1;
-      determine_value_range_1 (&vr0, TREE_OPERAND (expr, 0));
-      determine_value_range_1 (&vr1, TREE_OPERAND (expr, 1));
-      range_fold_binary_expr (vr, TREE_CODE (expr), TREE_TYPE (expr),
-                             &vr0, &vr1);
-    }
-  else if (UNARY_CLASS_P (expr))
-    {
-      value_range vr0;
-      determine_value_range_1 (&vr0, TREE_OPERAND (expr, 0));
-      range_fold_unary_expr (vr, TREE_CODE (expr), TREE_TYPE (expr),
-                            &vr0, TREE_TYPE (TREE_OPERAND (expr, 0)));
-    }
-  else if (TREE_CODE (expr) == INTEGER_CST)
-    vr->set (expr);
-  else
-    {
-      value_range r;
-      /* For SSA names try to extract range info computed by VRP.  Otherwise
-        fall back to varying.  */
-      if (TREE_CODE (expr) == SSA_NAME
-         && INTEGRAL_TYPE_P (TREE_TYPE (expr))
-         && get_range_query (cfun)->range_of_expr (r, expr)
-         && !r.undefined_p ())
-       *vr = r;
-      else
-       vr->set_varying (TREE_TYPE (expr));
-    }
-}
-
-/* Compute a value-range for EXPR and set it in *MIN and *MAX.  Return
-   the determined range type.  */
-
-value_range_kind
-determine_value_range (tree expr, wide_int *min, wide_int *max)
-{
-  value_range vr;
-  determine_value_range_1 (&vr, expr);
-  if (!vr.varying_p () && vr.constant_p ())
-    {
-      *min = wi::to_wide (vr.min ());
-      *max = wi::to_wide (vr.max ());
-      return vr.kind ();
-    }
-
-  return VR_VARYING;
-}

diff --git a/gcc/tree-vrp.h b/gcc/tree-vrp.h
index 989d8430c9858c30ed9a2486e7a057b10038d435..3392ecc7b2368422962bce5f2f88150ffc3eb3ba 100644 (file)
--- a/gcc/tree-vrp.h
+++ b/gcc/tree-vrp.h
@@ -62,7 +62,6 @@ extern bool find_case_label_index (gswitch *, size_t, tree, size_t *);
 extern bool overflow_comparison_p (tree_code, tree, tree, bool, tree *);
 extern tree get_single_symbol (tree, bool *, tree *);
 extern void maybe_set_nonzero_bits (edge, tree);
-extern value_range_kind determine_value_range (tree, wide_int *, wide_int *);
 extern wide_int masked_increment (const wide_int &val_in, const wide_int &mask,
                                  const wide_int &sgnbit, unsigned int prec);