Skip to content

Commit 12f7ae1

Browse files
committed
Avoid no-op unlink+link dances in incr comp
1 parent bd63354 commit 12f7ae1

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/driver/aot.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,14 @@ impl OngoingCodegen {
103103
("o", &module_regular.object.as_ref().unwrap()),
104104
("asm.o", &module_global_asm.object.as_ref().unwrap()),
105105
],
106+
&[],
106107
)
107108
} else {
108109
rustc_incremental::copy_cgu_workproduct_to_incr_comp_cache_dir(
109110
sess,
110111
&module_regular.name,
111112
&[("o", &module_regular.object.as_ref().unwrap())],
113+
&[],
112114
)
113115
};
114116
if let Some((work_product_id, work_product)) = work_product {
@@ -381,6 +383,7 @@ fn emit_cgu(
381383
bytecode: None,
382384
assembly: None,
383385
llvm_ir: None,
386+
links_from_incr_cache: Vec::new(),
384387
}),
385388
existing_work_product: None,
386389
})
@@ -437,6 +440,7 @@ fn emit_module(
437440
bytecode: None,
438441
assembly: None,
439442
llvm_ir: None,
443+
links_from_incr_cache: Vec::new(),
440444
})
441445
}
442446

@@ -487,6 +491,7 @@ fn reuse_workproduct_for_cgu(
487491
bytecode: None,
488492
assembly: None,
489493
llvm_ir: None,
494+
links_from_incr_cache: Vec::new(),
490495
},
491496
module_global_asm: has_global_asm.then(|| CompiledModule {
492497
name: cgu.name().to_string(),
@@ -496,6 +501,7 @@ fn reuse_workproduct_for_cgu(
496501
bytecode: None,
497502
assembly: None,
498503
llvm_ir: None,
504+
links_from_incr_cache: Vec::new(),
499505
}),
500506
existing_work_product: Some((cgu.work_product_id(), work_product)),
501507
})
@@ -637,6 +643,7 @@ fn emit_metadata_module(tcx: TyCtxt<'_>, metadata: &EncodedMetadata) -> Compiled
637643
bytecode: None,
638644
assembly: None,
639645
llvm_ir: None,
646+
links_from_incr_cache: Vec::new(),
640647
}
641648
}
642649

@@ -745,7 +752,6 @@ pub(crate) fn run_aot(
745752

746753
let metadata_module =
747754
if need_metadata_module { Some(emit_metadata_module(tcx, &metadata)) } else { None };
748-
749755
Box::new(OngoingCodegen {
750756
modules,
751757
allocator_module,

0 commit comments

Comments
 (0)