From d12587f2189ebefedc10d29557ed24d90d8fb01b Mon Sep 17 00:00:00 2001
From: Tyler McMullen <tyler@fastly.com>
Date: Wed, 29 Nov 2017 02:28:18 -0800
Subject: [PATCH] Assign explicit register location to result of frame-pointer
 pop.

---
 lib/cretonne/src/isa/intel/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/cretonne/src/isa/intel/mod.rs b/lib/cretonne/src/isa/intel/mod.rs
index d96fbf1cde..c6dfeb937a 100644
--- a/lib/cretonne/src/isa/intel/mod.rs
+++ b/lib/cretonne/src/isa/intel/mod.rs
@@ -180,6 +180,7 @@ impl TargetIsa for Isa {
 
         for inst in return_insts {
             let fp_ret = self.insert_epilogue(inst, local_stack_size as i32, func);
+            func.locations[fp_ret] = ir::ValueLoc::Reg(RU::rbp as RegUnit);
             func.dfg.append_inst_arg(inst, fp_ret);
         }