From 0b76af209587ac366351c9eb470c609c4e9cf065 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Wed, 7 Nov 2018 13:35:10 +0100
Subject: [PATCH] Remove should_codegen

---
 src/base.rs | 13 +++++--------
 src/lib.rs  | 28 +++++++++-------------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/base.rs b/src/base.rs
index 0b7e657f17f3..3bf906a460c2 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -129,14 +129,11 @@ fn trans_fn<'a, 'tcx: 'a>(
     verify_func(tcx, writer, &func);
 
     // Step 9. Define function
-    // TODO: cranelift doesn't yet support some of the things needed
-    if should_codegen(tcx.sess) {
-        caches.context.func = func;
-        module
-            .define_function(func_id, &mut caches.context)
-            .unwrap();
-        caches.context.clear();
-    }
+    caches.context.func = func;
+    module
+        .define_function(func_id, &mut caches.context)
+        .unwrap();
+    caches.context.clear();
 }
 
 fn verify_func(tcx: TyCtxt, writer: crate::pretty_clif::CommentWriter, func: &Function) {
diff --git a/src/lib.rs b/src/lib.rs
index 8dccc6e26a84..2fd5d8c04eac 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -98,12 +98,6 @@ mod prelude {
     pub use crate::base::{trans_operand, trans_place};
     pub use crate::common::*;
     pub use crate::Caches;
-
-    pub fn should_codegen(_sess: &Session) -> bool {
-        true
-        //::std::env::var("SHOULD_CODEGEN").is_ok()
-        //    || sess.crate_types.get().contains(&CrateType::Executable)
-    }
 }
 
 use crate::constant::ConstantCx;
@@ -242,9 +236,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
 
             tcx.sess.abort_if_errors();
 
-            if should_codegen(tcx.sess) {
-                faerie_module.finalize_definitions();
-            }
+            faerie_module.finalize_definitions();
 
             return Box::new(OngoingCodegen {
                 product: faerie_module.finish(),
@@ -294,16 +286,14 @@ impl CodegenBackend for CraneliftCodegenBackend {
                     let file = File::create(&output_name).unwrap();
                     let mut builder = ar::Builder::new(file);
 
-                    if should_codegen(sess) {
-                        // Add main object file
-                        let obj = artifact.emit().unwrap();
-                        builder
-                            .append(
-                                &ar::Header::new(b"data.o".to_vec(), obj.len() as u64),
-                                ::std::io::Cursor::new(obj),
-                            )
-                            .unwrap();
-                    }
+                    // Add main object file
+                    let obj = artifact.emit().unwrap();
+                    builder
+                        .append(
+                            &ar::Header::new(b"data.o".to_vec(), obj.len() as u64),
+                            ::std::io::Cursor::new(obj),
+                        )
+                        .unwrap();
 
                     // Non object files need to be added after object files, because ranlib will
                     // try to read the native architecture from the first file, even if it isn't