From 268e8e3114b5a1b3ca66ec8f2b64c0a44e7fbe22 Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <jolesen@mozilla.com>
Date: Wed, 21 Jun 2017 10:03:39 -0700
Subject: [PATCH] Add two interference checking methods to LiveInterval.

The overlaps_def() method tests if a definition would conflict with the
live range.

The reaches_use() method tests if a live range is live at an
instruction.
---
 lib/cretonne/src/regalloc/liverange.rs | 36 +++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/cretonne/src/regalloc/liverange.rs b/lib/cretonne/src/regalloc/liverange.rs
index 9866fabb20..95dfb49f2e 100644
--- a/lib/cretonne/src/regalloc/liverange.rs
+++ b/lib/cretonne/src/regalloc/liverange.rs
@@ -108,7 +108,7 @@
 //!
 
 use std::cmp::Ordering;
-use ir::{Inst, Ebb, Value, ProgramPoint, ProgramOrder};
+use ir::{Inst, Ebb, Value, ProgramPoint, ExpandedProgramPoint, ProgramOrder};
 use regalloc::affinity::Affinity;
 use sparse_map::SparseMapValue;
 
@@ -381,6 +381,40 @@ impl LiveRange {
     pub fn liveins(&self) -> &[Interval] {
         &self.liveins
     }
+
+    /// Check if this live range overlaps a definition in `ebb`.
+    pub fn overlaps_def<PO>(&self, def: ExpandedProgramPoint, ebb: Ebb, order: &PO) -> bool
+        where PO: ProgramOrder
+    {
+        // Check for an overlap with the local range.
+        if order.cmp(def, self.def_begin) != Ordering::Less &&
+           order.cmp(def, self.def_end) == Ordering::Less {
+            return true;
+        }
+
+        // Check for an overlap with a live-in range.
+        match self.livein_local_end(ebb, order) {
+            Some(inst) => order.cmp(def, inst) == Ordering::Less,
+            None => false,
+        }
+    }
+
+    /// Check if this live range reaches a use at `inst` in `ebb`.
+    pub fn reaches_use<PO>(&self, user: Inst, ebb: Ebb, order: &PO) -> bool
+        where PO: ProgramOrder
+    {
+        // Check for an overlap with the local range.
+        if order.cmp(user, self.def_begin) == Ordering::Greater &&
+           order.cmp(user, self.def_end) != Ordering::Greater {
+            return true;
+        }
+
+        // Check for an overlap with a live-in range.
+        match self.livein_local_end(ebb, order) {
+            Some(inst) => order.cmp(user, inst) != Ordering::Greater,
+            None => false,
+        }
+    }
 }
 
 /// Allow a `LiveRange` to be stored in a `SparseMap` indexed by values.