Minor fixes to vr_values to not die on non integral types.

The legacy code in vr_values mostly works on integral types (with few
exceptions such as some conversions from float).  This patch makes
vr_values::range_of_expr not die when asked for a range of an
unsupported type.  It also keeps the min/max simplification code from
being called on non integrals, similarly to what many of the other
assignment code is doing.

This is all a nop on the current code, but will keep us from
misbehaving when VRP starts working on non-integrals.

Tested on x86-64 Linux.

gcc/ChangeLog:

	* value-query.cc (range_query::get_value_range): Add assert.
	* vr-values.cc (vr_values::range_of_expr): Make sure we don't ICE
	on unsupported types in vr_values.
	(simplify_using_ranges::simplify): Same.

diff --git a/gcc/value-query.cc b/gcc/value-query.cc
index 3560d19f1ae2a425e64a216ff23f382d0601839d..decf5aae1feb45bcfef9e10e02457f774183f3a5 100644 (file)
--- a/gcc/value-query.cc
+++ b/gcc/value-query.cc
@@ -167,6 +167,7 @@ range_query::free_value_range_equiv (value_range_equiv *v)
 const class value_range_equiv *
 range_query::get_value_range (const_tree expr, gimple *stmt)
 {
+  gcc_checking_assert (value_range_equiv::supports_p (TREE_TYPE (expr)));
   int_range_max r;
   if (range_of_expr (r, const_cast<tree> (expr), stmt))
     return new (equiv_alloc->allocate ()) value_range_equiv (r);

diff --git a/gcc/vr-values.cc b/gcc/vr-values.cc
index 6b9c630fed34ee1d87a5dd8b3839aaaaa61abc2c..626a91894726a4beef77c282aeae5f7f0b7876db 100644 (file)
--- a/gcc/vr-values.cc
+++ b/gcc/vr-values.cc
@@ -188,6 +188,17 @@ vr_values::range_of_expr (vrange &r, tree expr, gimple *stmt)
        r = *vr;
       else
        {
+         if (!vr->supports_type_p (TREE_TYPE (expr)))
+           {
+             // vr_values::extract_range_basic() use of ranger's
+             // fold_range() can create a situation where we are
+             // asked for the range of an unsupported legacy type.
+             // Since get_value_range() above will return varying for
+             // such types, avoid copying incompatible range types.
+             gcc_checking_assert (vr->varying_p ());
+             r.set_varying (TREE_TYPE (expr));
+             return true;
+           }
          value_range tmp = *vr;
          tmp.normalize_symbolics ();
          r = tmp;
@@ -4375,7 +4386,9 @@ simplify_using_ranges::simplify (gimple_stmt_iterator *gsi)
 
        case MIN_EXPR:
        case MAX_EXPR:
-         return simplify_min_or_max_using_ranges (gsi, stmt);
+         if (INTEGRAL_TYPE_P (TREE_TYPE (rhs1)))
+           return simplify_min_or_max_using_ranges (gsi, stmt);
+         break;
 
        case RSHIFT_EXPR:
          {