From 8ced1d76b143b6856699f815813045d551e3cef9 Mon Sep 17 00:00:00 2001 From: Aldy Hernandez Date: Mon, 4 Nov 2019 21:41:12 +0000 Subject: [PATCH] Use the value_range_base constructors in value_range_base::invert to make sure we build canonically correct ranges. From-SVN: r277794 --- gcc/ChangeLog | 5 +++++ gcc/tree-vrp.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c585360b537..6bdd5ffddbd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-11-04 Aldy Hernandez + + * tree-vrp.c (value_range_base::invert): Use constructors to build + range. + 2019-11-04 Aldy Hernandez * tree-vrp.c (range_int_cst_singleton_p): Remove. diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 070db903147..085308e519f 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -6286,10 +6286,12 @@ value_range_base::contains_p (tree cst) const void value_range_base::invert () { + /* We can't just invert VR_RANGE and VR_ANTI_RANGE because we may + create non-canonical ranges. Use the constructors instead. */ if (m_kind == VR_RANGE) - m_kind = VR_ANTI_RANGE; + *this = value_range_base (VR_ANTI_RANGE, m_min, m_max); else if (m_kind == VR_ANTI_RANGE) - m_kind = VR_RANGE; + *this = value_range_base (VR_RANGE, m_min, m_max); else gcc_unreachable (); } -- 2.30.2