Extract emit_allocator_module

rust-lang · Dec 4, 2024 · 87cd09b · 87cd09b
1 parent 27c9960
commit 87cd09b
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/src/driver/aot.rs b/src/driver/aot.rs
@@ -660,10 +660,26 @@ pub(crate) fn run_aot(
         modules
     });
 
+    let allocator_module = emit_allocator_module(tcx);
+
+    let metadata_module =
+        if need_metadata_module { Some(emit_metadata_module(tcx, &metadata)) } else { None };
+
+    Box::new(OngoingCodegen {
+        modules,
+        allocator_module,
+        metadata_module,
+        metadata,
+        crate_info: CrateInfo::new(tcx, target_cpu),
+        concurrency_limiter: concurrency_limiter.0,
+    })
+}
+
+fn emit_allocator_module(tcx: TyCtxt<'_>) -> Option<CompiledModule> {
     let mut allocator_module = make_module(tcx.sess, "allocator_shim".to_string());
     let created_alloc_shim = crate::allocator::codegen(tcx, &mut allocator_module);
 
-    let allocator_module = if created_alloc_shim {
+    if created_alloc_shim {
         let product = allocator_module.finish();
 
         match emit_module(
@@ -679,19 +695,7 @@ pub(crate) fn run_aot(
         }
     } else {
         None
-    };
-
-    let metadata_module =
-        if need_metadata_module { Some(emit_metadata_module(tcx, &metadata)) } else { None };
-
-    Box::new(OngoingCodegen {
-        modules,
-        allocator_module,
-        metadata_module,
-        metadata,
-        crate_info: CrateInfo::new(tcx, target_cpu),
-        concurrency_limiter: concurrency_limiter.0,
-    })
+    }
 }
 
 fn emit_metadata_module(tcx: TyCtxt<'_>, metadata: &EncodedMetadata) -> CompiledModule {