@@ -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 ();
}
@@ -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;
@@ -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