Prepend temp files with a string per invocation of rustc

Author: compiler-errors

src/driver/aot.rs

@@ -169,8 +169,11 @@ fn produce_final_output_artifacts(
 if codegen_results.modules.len() == 1{
 // 1) Only one codegen unit. In this case it's no difficulty
 // to copy `foo.0.x` to `foo.x`.
-let path =
- crate_output.temp_path_for_cgu(output_type,&codegen_results.modules[0].name);
+let path = crate_output.temp_path_for_cgu(
+ output_type,
+&codegen_results.modules[0].name,
+ sess.invocation_temp.as_deref(),
+);
 let output = crate_output.path(output_type);
 if !output_type.is_text_output() && output.is_tty(){
  sess.dcx()
@@ -345,6 +348,7 @@ fn make_module(sess: &Session, name: String) -> UnwindModule<ObjectModule> {
 
 fnemit_cgu(
 output_filenames:&OutputFilenames,
+invocation_temp:Option<&str>,
 prof:&SelfProfilerRef,
 name:String,
 module:UnwindModule<ObjectModule>,
@@ -360,6 +364,7 @@ fn emit_cgu(
 
 let module_regular = emit_module(
  output_filenames,
+ invocation_temp,
  prof,
  product.object,
 ModuleKind::Regular,
@@ -385,6 +390,7 @@ fn emit_cgu(
 
 fnemit_module(
 output_filenames:&OutputFilenames,
+invocation_temp:Option<&str>,
 prof:&SelfProfilerRef,
 mutobject: cranelift_object::object::write::Object<'_>,
 kind:ModuleKind,
@@ -403,7 +409,7 @@ fn emit_module(
  object.set_section_data(comment_section, producer,1);
 }
 
-let tmp_file = output_filenames.temp_path_for_cgu(OutputType::Object,&name);
+let tmp_file = output_filenames.temp_path_for_cgu(OutputType::Object,&name, invocation_temp);
 let file = matchFile::create(&tmp_file){
 Ok(file) => file,
 Err(err) => returnErr(format!("error creating object file: {}", err)),
@@ -443,8 +449,11 @@ fn reuse_workproduct_for_cgu(
 cgu:&CodegenUnit<'_>,
 ) -> Result<ModuleCodegenResult,String>{
 let work_product = cgu.previous_work_product(tcx);
-let obj_out_regular =
- tcx.output_filenames(()).temp_path_for_cgu(OutputType::Object, cgu.name().as_str());
+let obj_out_regular = tcx.output_filenames(()).temp_path_for_cgu(
+OutputType::Object,
+ cgu.name().as_str(),
+ tcx.sess.invocation_temp.as_deref(),
+);
 let source_file_regular = rustc_incremental::in_incr_comp_dir_sess(
 &tcx.sess,
 &work_product.saved_files.get("o").expect("no saved object file in work product"),
@@ -589,13 +598,19 @@ 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,&cx.global_asm)
+crate::global_asm::compile_global_asm(
+&global_asm_config,
+&cgu_name,
+&cx.global_asm,
+ cx.invocation_temp.as_deref(),
+)
 })?;
 
 let codegen_result =
  profiler.generic_activity_with_arg("write object file",&*cgu_name).run(|| {
 emit_cgu(
 &global_asm_config.output_filenames,
+ cx.invocation_temp.as_deref(),
 &profiler,
  cgu_name,
  module,
@@ -620,8 +635,11 @@ fn emit_metadata_module(tcx: TyCtxt<'_>, metadata: &EncodedMetadata) -> Compiled
 .as_str()
 .to_string();
 
-let tmp_file =
- tcx.output_filenames(()).temp_path_for_cgu(OutputType::Metadata,&metadata_cgu_name);
+let tmp_file = tcx.output_filenames(()).temp_path_for_cgu(
+OutputType::Metadata,
+&metadata_cgu_name,
+ tcx.sess.invocation_temp.as_deref(),
+);
 
 let symbol_name = rustc_middle::middle::exported_symbols::metadata_symbol_name(tcx);
 let obj = create_compressed_metadata_file(tcx.sess, metadata,&symbol_name);
@@ -651,6 +669,7 @@ fn emit_allocator_module(tcx: TyCtxt<'_>) -> Option<CompiledModule> {
 
 matchemit_module(
  tcx.output_filenames(()),
+ tcx.sess.invocation_temp.as_deref(),
 &tcx.sess.prof,
  product.object,
 ModuleKind::Allocator,

src/global_asm.rs

@@ -132,6 +132,7 @@ pub(crate) fn compile_global_asm(
 config:&GlobalAsmConfig,
 cgu_name:&str,
 global_asm:&str,
+invocation_temp:Option<&str>,
 ) -> Result<Option<PathBuf>,String>{
 if global_asm.is_empty(){
 returnOk(None);
@@ -146,7 +147,7 @@ pub(crate) fn compile_global_asm(
  global_asm.push('\n');
 
 let global_asm_object_file = add_file_stem_postfix(
- config.output_filenames.temp_path_for_cgu(OutputType::Object, cgu_name),
+ config.output_filenames.temp_path_for_cgu(OutputType::Object, cgu_name, invocation_temp),
 ".asm",
 );
 

src/lib.rs

@@ -124,6 +124,7 @@ impl<F: Fn() -> String> Drop for PrintOnPanic<F> {
 /// inside a single codegen unit with the exception of the Cranelift [`Module`](cranelift_module::Module).
 structCodegenCx{
 output_filenames:Arc<OutputFilenames>,
+invocation_temp:Option<String>,
 should_write_ir:bool,
 global_asm:String,
 inline_asm_index:usize,
@@ -142,6 +143,7 @@ impl CodegenCx {
 };
 CodegenCx{
 output_filenames: tcx.output_filenames(()).clone(),
+invocation_temp: tcx.sess.invocation_temp.clone(),
 should_write_ir:crate::pretty_clif::should_write_ir(tcx),
 global_asm:String::new(),
 inline_asm_index:0,