diff options
| -rw-r--r-- | gcc/value-range.cc | 3 | ||||
| -rw-r--r-- | gcc/value-range.h | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/value-range.cc b/gcc/value-range.cc index 011bdbd..2abf57b 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -1953,9 +1953,6 @@ void irange_bitmask::verify_mask () const { gcc_assert (m_value.get_precision () == m_mask.get_precision ()); - // Unknown bits must have their corresponding value bits cleared as - // it simplifies union and intersect. - gcc_assert (wi::bit_and (m_mask, m_value) == 0); } void diff --git a/gcc/value-range.h b/gcc/value-range.h index 0170188..d8af6fc 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -211,8 +211,12 @@ irange_bitmask::operator== (const irange_bitmask &src) const } inline bool -irange_bitmask::union_ (const irange_bitmask &src) +irange_bitmask::union_ (const irange_bitmask &orig_src) { + // Normalize mask. + irange_bitmask src (orig_src.m_value & ~orig_src.m_mask, orig_src.m_mask); + m_value &= ~m_mask; + irange_bitmask save (*this); m_mask = (m_mask | src.m_mask) | (m_value ^ src.m_value); m_value = m_value & src.m_value; @@ -222,8 +226,12 @@ irange_bitmask::union_ (const irange_bitmask &src) } inline bool -irange_bitmask::intersect (const irange_bitmask &src) +irange_bitmask::intersect (const irange_bitmask &orig_src) { + // Normalize mask. + irange_bitmask src (orig_src.m_value & ~orig_src.m_mask, orig_src.m_mask); + m_value &= ~m_mask; + irange_bitmask save (*this); // If we have two known bits that are incompatible, the resulting // bit is undefined. It is unclear whether we should set the entire |