Allow non-LTO mode

Author: bjorn3

src/driver/lto.rs

@@ -214,6 +214,8 @@ pub(super) fn load_lto_modules(
 }
 
 pub(crate) fn run_aot(tcx: TyCtxt<'_>) -> Box<OngoingCodegen> {
+    tcx.dcx().note(format!("Using LTO for {}", tcx.crate_name(LOCAL_CRATE)));
+
     // FIXME handle `-Ctarget-cpu=native`
     let target_cpu = match tcx.sess.opts.cg.target_cpu {
         Some(ref name) => name,

src/lib.rs

@@ -161,16 +161,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
     }
 
     fn init(&self, sess: &Session) {
-        use rustc_session::config::{InstrumentCoverage, Lto};
-        match sess.lto() {
-            Lto::No | Lto::ThinLocal => {
-                if sess.opts.crate_name.as_deref() != Some("___") {
-                    sess.dcx().fatal("No LTO");
-                }
-            }
-            Lto::Thin | Lto::Fat => {}
-        }
-
+        use rustc_session::config::InstrumentCoverage;
         if sess.opts.cg.instrument_coverage() != InstrumentCoverage::No {
             sess.dcx()
                 .fatal("`-Cinstrument-coverage` is LLVM specific and not supported by Cranelift");
@@ -252,18 +243,16 @@ impl CodegenBackend for CraneliftCodegenBackend {
             match tcx.sess.lto() {
                 Lto::No | Lto::ThinLocal => driver::aot::run_aot(tcx),
                 Lto::Thin | Lto::Fat => {
-                    if tcx.crate_name(LOCAL_CRATE).as_str() == "compiler_builtins" {
-                        // FIXME remove special case once inline asm is supported in LTO mode
-                        driver::aot::run_aot(tcx)
-                    } else {
-                        #[cfg(feature = "lto")]
-                        return driver::lto::run_aot(tcx);
-
-                        #[cfg(not(feature = "lto"))]
-                        tcx.dcx().fatal(
-                            "LTO support was disabled when compiling rustc_codegen_cranelift",
-                        );
+                    if tcx.crate_name(LOCAL_CRATE) == sym::compiler_builtins {
+                        return driver::aot::run_aot(tcx);
                     }
+
+                    #[cfg(feature = "lto")]
+                    return driver::lto::run_aot(tcx);
+
+                    #[cfg(not(feature = "lto"))]
+                    tcx.dcx()
+                        .fatal("LTO support was disabled when compiling rustc_codegen_cranelift");
                 }
             }
         }