Do not set NAN flags for VARYING ranges when !HONOR_NANS.

Since NANs can't appear in ranges for !HONOR_NANS, there's no reason
to set them in a VARYING range.

gcc/ChangeLog:

	* value-range.h (frange::set_varying): Do not set NAN flags for
	!HONOR_NANS.
	* value-range.cc (frange::normalize_kind): Adjust for no NAN when
	!HONOR_NANS.
	(frange::verify_range): Same.
	* range-op-float.cc (maybe_isnan): Remove flag_finite_math_only check.

diff --git a/gcc/range-op-float.cc b/gcc/range-op-float.cc
index 2a4a99ba4678ec23cf807467c3d4ed1ff0d72860..a9e74c868772903fd2f5330fd7e8cfbadddaabe9 100644 (file)
--- a/gcc/range-op-float.cc
+++ b/gcc/range-op-float.cc
@@ -171,9 +171,6 @@ range_operator_float::op1_op2_relation (const frange &lhs ATTRIBUTE_UNUSED) cons
 static inline bool
 maybe_isnan (const frange &op1, const frange &op2)
 {
-  if (flag_finite_math_only)
-    return false;
-
   return op1.maybe_isnan () || op2.maybe_isnan ();
 }
 

diff --git a/gcc/value-range.cc b/gcc/value-range.cc
index 511cd0ad7679394ad60e861162a3ba7a158e9f55..bcda4987307c1e8e327df8ab04755eb455e27439 100644 (file)
--- a/gcc/value-range.cc
+++ b/gcc/value-range.cc
@@ -388,7 +388,7 @@ frange::normalize_kind ()
       && frange_val_is_min (m_min, m_type)
       && frange_val_is_max (m_max, m_type))
     {
-      if (m_pos_nan && m_neg_nan)
+      if (!HONOR_NANS (m_type) || (m_pos_nan && m_neg_nan))
        {
          set_varying (m_type);
          return true;
@@ -396,7 +396,7 @@ frange::normalize_kind ()
     }
   else if (m_kind == VR_VARYING)
     {
-      if (!m_pos_nan || !m_neg_nan)
+      if (HONOR_NANS (m_type) && (!m_pos_nan || !m_neg_nan))
        {
          m_kind = VR_RANGE;
          m_min = frange_val_min (m_type);
@@ -712,14 +712,19 @@ frange::supports_type_p (const_tree type) const
 void
 frange::verify_range ()
 {
+  if (flag_finite_math_only)
+    gcc_checking_assert (!maybe_isnan ());
   switch (m_kind)
     {
     case VR_UNDEFINED:
       gcc_checking_assert (!m_type);
       return;
     case VR_VARYING:
+      if (flag_finite_math_only)
+       gcc_checking_assert (!m_pos_nan && !m_neg_nan);
+      else
+       gcc_checking_assert (m_pos_nan && m_neg_nan);
       gcc_checking_assert (m_type);
-      gcc_checking_assert (m_pos_nan && m_neg_nan);
       gcc_checking_assert (frange_val_is_min (m_min, m_type));
       gcc_checking_assert (frange_val_is_max (m_max, m_type));
       return;

diff --git a/gcc/value-range.h b/gcc/value-range.h
index 60b989b2b50351c0281d4a0fdc8b4ed1e99ac3a1..b48542a68aa14f1306550c7f64bd2ef9cddbd277 100644 (file)
--- a/gcc/value-range.h
+++ b/gcc/value-range.h
@@ -1103,8 +1103,16 @@ frange::set_varying (tree type)
   m_type = type;
   m_min = frange_val_min (type);
   m_max = frange_val_max (type);
-  m_pos_nan = true;
-  m_neg_nan = true;
+  if (HONOR_NANS (m_type))
+    {
+      m_pos_nan = true;
+      m_neg_nan = true;
+    }
+  else
+    {
+      m_pos_nan = false;
+      m_neg_nan = false;
+    }
 }
 
 inline void