This patch provides inchash support for vrange. It is along the lines
of the streaming support I just posted and will be used for IPA
hashing of ranges.
Thoughts?
gcc/ChangeLog:
* inchash.cc (hash::add_real_value): New.
* inchash.h (class hash): Add add_real_value.
* value-range.cc (add_vrange): New.
* value-range.h (inchash::add_vrange): New.
---
gcc/inchash.cc | 20 +++++++++++++++++++
gcc/inchash.h | 2 ++
gcc/value-range.cc | 48 ++++++++++++++++++++++++++++++++++++++++++++++
gcc/value-range.h | 6 ++++++
4 files changed, 76 insertions(+)
diff --git a/gcc/inchash.cc b/gcc/inchash.cc
index a30662b97fe..914e3cc92cd 100644
--- a/gcc/inchash.cc
+++ b/gcc/inchash.cc
@@ -24,3 +24,23 @@ along with GCC; see the file COPYING3. If not see
#endif
#include "system.h"
#include "coretypes.h"
+#include "real.h"
+#include "inchash.h"
+
+namespace inchash
+{
+
+/* This is here instead of inchash.h to keep us from having to put
+ real.h in coretypes.h. */
+void
+hash::add_real_value (const real_value &v)
+{
+ add_int (v.sign);
+ add_int (v.uexp);
+ for (unsigned i = 0; i < SIGSZ; ++i)
+ add_hwi (v.sig[i]);
+ /* Ignore the rest of the flags, as sign, exponent, and
+ significant bits should be enough. */
+}
+
+} // namespace inchash
diff --git a/gcc/inchash.h b/gcc/inchash.h
index bf76308431d..41ae153d1c5 100644
--- a/gcc/inchash.h
+++ b/gcc/inchash.h
@@ -88,6 +88,8 @@ class hash
add_hwi (x.sext_elt (i));
}
+ void add_real_value (const class real_value &v);
+
/* Hash in pointer PTR. */
void add_ptr (const void *ptr)
{
diff --git a/gcc/value-range.cc b/gcc/value-range.cc
index 963330eed79..31ec832e185 100644
--- a/gcc/value-range.cc
+++ b/gcc/value-range.cc
@@ -232,6 +232,54 @@ vrange::dump (FILE *file) const
pp_flush (&buffer);
}
+namespace inchash
+{
+
+void
+add_vrange (const vrange &v, inchash::hash &hstate,
+ unsigned int)
+{
+ if (v.undefined_p ())
+ {
+ hstate.add_int (VR_UNDEFINED);
+ return;
+ }
+ // Types are ignored throughout to inhibit two ranges being equal
+ // but having different hash values. This can happen when two
+ // ranges are equal types_compatible_p is true.
+ if (is_a <irange> (v))
+ {
+ const irange &r = as_a <irange> (v);
+ if (r.varying_p ())
+ hstate.add_int (VR_VARYING);
+ else
+ hstate.add_int (VR_RANGE);
+ for (unsigned i = 0; i < r.num_pairs (); ++i)
+ {
+ hstate.add_wide_int (r.lower_bound (i));
+ hstate.add_wide_int (r.upper_bound (i));
+ }
+ hstate.add_wide_int (r.get_nonzero_bits ());
+ return;
+ }
+ if (is_a <frange> (v))
+ {
+ const frange &r = as_a <frange> (v);
+ if (r.varying_p ())
+ hstate.add_int (VR_VARYING);
+ else
+ hstate.add_int (VR_RANGE);
+ hstate.add_real_value (r.m_min);
+ hstate.add_real_value (r.m_max);
+ hstate.add_int (r.m_pos_nan);
+ hstate.add_int (r.m_neg_nan);
+ return;
+ }
+ gcc_unreachable ();
+}
+
+} //namespace inchash
+
bool
irange::supports_type_p (const_tree type) const
{
diff --git a/gcc/value-range.h b/gcc/value-range.h
index e56df9db901..cb7418208d4 100644
--- a/gcc/value-range.h
+++ b/gcc/value-range.h
@@ -109,6 +109,11 @@ protected:
const ENUM_BITFIELD(value_range_discriminator) m_discriminator : 4;
};
+namespace inchash
+{
+ extern void add_vrange (const vrange &, hash &, unsigned flags = 0);
+}
+
// An integer range without any storage.
class GTY((user)) irange : public vrange
@@ -332,6 +337,7 @@ class frange : public vrange
friend void streamer_read_value_range (class lto_input_block *,
class data_in *,
class Value_Range &);
+ friend void inchash::add_vrange (const vrange &, inchash::hash &, unsigned);
public:
frange ();
frange (const frange &);
--
2.39.2
