Remove output_filenames field from GlobalAsmConfig

Author: bjorn3

src/driver/aot.rs

@@ -384,13 +384,25 @@ fn module_codegen(
 
         let global_asm_object_file =
             profiler.generic_activity_with_arg("compile assembly", &*cgu_name).run(|| {
-                crate::global_asm::compile_global_asm(&global_asm_config, &cgu_name, global_asm)
+                if global_asm.is_empty() {
+                    return Ok::<_, String>(None);
+                }
+
+                let global_asm_object_file =
+                    output_filenames.temp_path_ext_for_cgu("asm.o", &*cgu_name);
+                crate::global_asm::compile_global_asm(
+                    &global_asm_config,
+                    global_asm,
+                    &global_asm_object_file,
+                )?;
+
+                Ok(Some(global_asm_object_file))
             })?;
 
         let codegen_result =
             profiler.generic_activity_with_arg("write object file", &*cgu_name).run(|| {
                 emit_cgu(
-                    &global_asm_config.output_filenames,
+                    &output_filenames,
                     &profiler,
                     cgu_name,
                     module,
@@ -449,7 +461,7 @@ pub(crate) fn run_aot(tcx: TyCtxt<'_>) -> Box<OngoingCodegen> {
         }
     });
 
-    let global_asm_config = Arc::new(crate::global_asm::GlobalAsmConfig::new(tcx));
+    let global_asm_config = Arc::new(crate::global_asm::GlobalAsmConfig::new(tcx.sess));
 
     let (todo_cgus, done_cgus) =
         cgus.iter().enumerate().partition::<Vec<_>, _>(|&(i, _)| match cgu_reuse[i] {

src/global_asm.rs

@@ -2,17 +2,16 @@
 //! standalone executable.
 
 use std::io::Write;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
-use std::sync::Arc;
 
 use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};
 use rustc_codegen_ssa::traits::{AsmCodegenMethods, GlobalAsmOperandRef};
 use rustc_middle::ty::TyCtxt;
 use rustc_middle::ty::layout::{
     FnAbiError, FnAbiOfHelpers, FnAbiRequest, HasTyCtxt, HasTypingEnv, LayoutError, LayoutOfHelpers,
 };
-use rustc_session::config::OutputFilenames;
+use rustc_session::Session;
 use rustc_target::asm::InlineAsmArch;
 
 use crate::prelude::*;
@@ -163,32 +162,28 @@ fn codegen_global_asm_inner<'tcx>(
 pub(crate) struct GlobalAsmConfig {
     assembler: PathBuf,
     target: String,
-    pub(crate) output_filenames: Arc<OutputFilenames>,
 }
 
 impl GlobalAsmConfig {
-    pub(crate) fn new(tcx: TyCtxt<'_>) -> Self {
+    pub(crate) fn new(sess: &Session) -> Self {
         GlobalAsmConfig {
-            assembler: crate::toolchain::get_toolchain_binary(tcx.sess, "as"),
-            target: match &tcx.sess.opts.target_triple {
+            assembler: crate::toolchain::get_toolchain_binary(sess, "as"),
+            target: match &sess.opts.target_triple {
                 rustc_target::spec::TargetTuple::TargetTuple(triple) => triple.clone(),
                 rustc_target::spec::TargetTuple::TargetJson { path_for_rustdoc, .. } => {
                     path_for_rustdoc.to_str().unwrap().to_owned()
                 }
             },
-            output_filenames: tcx.output_filenames(()).clone(),
         }
     }
 }
 
 pub(crate) fn compile_global_asm(
     config: &GlobalAsmConfig,
-    cgu_name: &str,
     global_asm: String,
-) -> Result<Option<PathBuf>, String> {
-    if global_asm.is_empty() {
-        return Ok(None);
-    }
+    global_asm_object_file: &Path,
+) -> Result<(), String> {
+    assert!(!global_asm.is_empty());
 
     // Remove all LLVM style comments
     let mut global_asm = global_asm
@@ -198,8 +193,6 @@ pub(crate) fn compile_global_asm(
         .join("\n");
     global_asm.push('\n');
 
-    let global_asm_object_file = config.output_filenames.temp_path_ext_for_cgu("asm.o", cgu_name);
-
     // Assemble `global_asm`
     if option_env!("CG_CLIF_FORCE_GNU_AS").is_some() {
         let mut child = Command::new(&config.assembler)
@@ -266,5 +259,5 @@ pub(crate) fn compile_global_asm(
         }
     }
 
-    Ok(Some(global_asm_object_file))
+    Ok(())
 }