bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fill out links_from_incr_cache in cg_clif

Browse source
This commit is contained in:
Ben Kimock 2025-02-25 18:41:49 -05:00
parent cae7c76d50
commit e21502cf9e
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_codegen_cranelift/src/driver/aot.rs
View file

@ -464,22 +464,23 @@ fn reuse_workproduct_for_cgu(
err err
)); ));
} }
let obj_out_global_asm = let obj_out_global_asm =
crate::global_asm::add_file_stem_postfix(obj_out_regular.clone(), ".asm"); crate::global_asm::add_file_stem_postfix(obj_out_regular.clone(), ".asm");
let has_global_asm = if let Some(asm_o) = work_product.saved_files.get("asm.o") { let source_file_global_asm = if let Some(asm_o) = work_product.saved_files.get("asm.o") {
let source_file_global_asm = rustc_incremental::in_incr_comp_dir_sess(&tcx.sess, asm_o); let source_file_global_asm = rustc_incremental::in_incr_comp_dir_sess(&tcx.sess, asm_o);
if let Err(err) = rustc_fs_util::link_or_copy(&source_file_global_asm, &obj_out_global_asm) if let Err(err) = rustc_fs_util::link_or_copy(&source_file_global_asm, &obj_out_global_asm)
{ {
return Err(format!( return Err(format!(
"unable to copy {} to {}: {}", "unable to copy {} to {}: {}",
source_file_regular.display(), source_file_global_asm.display(),
obj_out_regular.display(), obj_out_global_asm.display(),
err err
)); ));
} }
true Some(source_file_global_asm)
} else { } else {
false None
}; };
Ok(ModuleCodegenResult { Ok(ModuleCodegenResult {
@ -491,9 +492,9 @@ fn reuse_workproduct_for_cgu(
bytecode: None, bytecode: None,
assembly: None, assembly: None,
llvm_ir: None, llvm_ir: None,
links_from_incr_cache: Vec::new(), links_from_incr_cache: vec![source_file_regular],
}, },
module_global_asm: has_global_asm.then(|| CompiledModule { module_global_asm: source_file_global_asm.map(|source_file| CompiledModule {
name: cgu.name().to_string(), name: cgu.name().to_string(),
kind: ModuleKind::Regular, kind: ModuleKind::Regular,
object: Some(obj_out_global_asm), object: Some(obj_out_global_asm),
@ -501,7 +502,7 @@ fn reuse_workproduct_for_cgu(
bytecode: None, bytecode: None,
assembly: None, assembly: None,
llvm_ir: None, llvm_ir: None,
links_from_incr_cache: Vec::new(), links_from_incr_cache: vec![source_file],
}), }),
existing_work_product: Some((cgu.work_product_id(), work_product)), existing_work_product: Some((cgu.work_product_id(), work_product)),
}) })
@ -752,6 +753,7 @@ pub(crate) fn run_aot(
let metadata_module = let metadata_module =
if need_metadata_module { Some(emit_metadata_module(tcx, &metadata)) } else { None }; if need_metadata_module { Some(emit_metadata_module(tcx, &metadata)) } else { None };
Box::new(OngoingCodegen { Box::new(OngoingCodegen {
modules, modules,
allocator_module, allocator_module,