From f0abff36111040607d4d9ab0146770b41f6eba1b Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <jolesen@mozilla.com>
Date: Wed, 5 Jul 2017 14:23:58 -0700
Subject: [PATCH] Handle tied operands that are not killed by their use.

Any tied register uses are interesting enough to be added to the reguses
list if their value is not killed.

A copy needs to be inserted in that case.
---
 cranelift/filetests/regalloc/constraints.cton | 13 ++++++++++++
 lib/cretonne/src/regalloc/spilling.rs         | 20 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/cranelift/filetests/regalloc/constraints.cton b/cranelift/filetests/regalloc/constraints.cton
index f405e67db9..720a886263 100644
--- a/cranelift/filetests/regalloc/constraints.cton
+++ b/cranelift/filetests/regalloc/constraints.cton
@@ -15,6 +15,19 @@ ebb0:
     return v2
 }
 
+; Tied operand is live after instruction.
+function %tied_alive() -> i32 {
+ebb0:
+    v0 = iconst.i32 12
+    v1 = iconst.i32 13
+    ; check: $(v0c=$V) = copy $v0
+    ; check: $v2 = isub $v0c, $v1
+    v2 = isub v0, v1
+    ; check: $v3 = iadd $v2, $v0
+    v3 = iadd v2, v0
+    return v3
+}
+
 ; Fixed register constraint.
 function %fixed_op() -> i32 {
 ebb0:
diff --git a/lib/cretonne/src/regalloc/spilling.rs b/lib/cretonne/src/regalloc/spilling.rs
index 37ff870a26..465efa7856 100644
--- a/lib/cretonne/src/regalloc/spilling.rs
+++ b/lib/cretonne/src/regalloc/spilling.rs
@@ -26,6 +26,7 @@ use regalloc::live_value_tracker::{LiveValue, LiveValueTracker};
 use regalloc::liveness::Liveness;
 use regalloc::pressure::Pressure;
 use regalloc::virtregs::VirtRegs;
+use std::fmt;
 use topo_order::TopoOrder;
 
 /// Persistent data structures for the spilling pass.
@@ -338,7 +339,8 @@ impl<'a> Context<'a> {
             }
 
             // Only collect the interesting register uses.
-            if reguse.fixed || reguse.spilled {
+            if reguse.fixed || reguse.tied || reguse.spilled {
+                dbg!("  reguse: {}", reguse);
                 self.reg_uses.push(reguse);
             }
         }
@@ -578,3 +580,19 @@ impl RegUse {
         }
     }
 }
+
+impl fmt::Display for RegUse {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}@op{}", self.value, self.opidx)?;
+        if self.fixed {
+            write!(f, "/fixed")?;
+        }
+        if self.spilled {
+            write!(f, "/spilled")?;
+        }
+        if self.tied {
+            write!(f, "/tied")?;
+        }
+        Ok(())
+    }
+}