From b391524b4f59ea250939def0580c0754eb839c6c Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sat, 11 Aug 2018 11:01:48 +0200
Subject: [PATCH] Move return codegen to abi.rs

---
 src/abi.rs  | 4 ++++
 src/base.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/abi.rs b/src/abi.rs
index 65271974e72..2c893d49390 100644
--- a/src/abi.rs
+++ b/src/abi.rs
@@ -386,6 +386,10 @@ pub fn codegen_call<'a, 'tcx: 'a>(
     }
 }
 
+pub fn codegen_return(fx: &mut FunctionCx) {
+    fx.bcx.ins().return_(&[]);
+}
+
 fn codegen_intrinsic_call<'a, 'tcx: 'a>(
     fx: &mut FunctionCx<'a, 'tcx>,
     fn_ty: Ty<'tcx>,
diff --git a/src/base.rs b/src/base.rs
index 5ece23fc4db..a610a066ffc 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -157,7 +157,7 @@ pub fn trans_fn<'a, 'tcx: 'a>(
                 fx.bcx.ins().jump(ebb, &[]);
             }
             TerminatorKind::Return => {
-                fx.bcx.ins().return_(&[]);
+                crate::abi::codegen_return(fx);
             }
             TerminatorKind::Assert {
                 cond,