Skip to content

Commit e16c3b4

Browse files
bjorn3bjorn3
committed
Make saved_file field of WorkProduct non-optional
A WorkProduct without a saved file is useless
1 parent 906b851 commit e16c3b4

File tree

6 files changed

+51
-69
lines changed

6 files changed

+51
-69
lines changed

‎compiler/rustc_codegen_cranelift/src/driver/aot.rs

+10-15
Original file line numberDiff line numberDiff line change
@@ -80,29 +80,24 @@ fn reuse_workproduct_for_cgu(
8080
cgu: &CodegenUnit<'_>,
8181
work_products: &mut FxHashMap<WorkProductId, WorkProduct>,
8282
) -> CompiledModule {
83-
let mut object = None;
8483
let work_product = cgu.previous_work_product(tcx);
85-
if let Some(saved_file) = &work_product.saved_file {
86-
let obj_out =
87-
tcx.output_filenames(()).temp_path(OutputType::Object, Some(cgu.name().as_str()));
88-
object = Some(obj_out.clone());
89-
let source_file = rustc_incremental::in_incr_comp_dir_sess(&tcx.sess, &saved_file);
90-
if let Err(err) = rustc_fs_util::link_or_copy(&source_file, &obj_out) {
91-
tcx.sess.err(&format!(
92-
"unable to copy {} to {}: {}",
93-
source_file.display(),
94-
obj_out.display(),
95-
err
96-
));
97-
}
84+
let obj_out = tcx.output_filenames(()).temp_path(OutputType::Object, Some(cgu.name().as_str()));
85+
let source_file = rustc_incremental::in_incr_comp_dir_sess(&tcx.sess, &work_product.saved_file);
86+
if let Err(err) = rustc_fs_util::link_or_copy(&source_file, &obj_out) {
87+
tcx.sess.err(&format!(
88+
"unable to copy {} to {}: {}",
89+
source_file.display(),
90+
obj_out.display(),
91+
err
92+
));
9893
}
9994

10095
work_products.insert(cgu.work_product_id(), work_product);
10196

10297
CompiledModule {
10398
name: cgu.name().to_string(),
10499
kind: ModuleKind::Regular,
105-
object,
100+
object: Some(obj_out),
106101
dwarf_object: None,
107102
bytecode: None,
108103
}

‎compiler/rustc_codegen_ssa/src/back/write.rs

+19-23
Original file line numberDiff line numberDiff line change
@@ -853,35 +853,31 @@ fn execute_copy_from_cache_work_item<B: ExtraBackendMethods>(
853853
module: CachedModuleCodegen,
854854
module_config: &ModuleConfig,
855855
) -> WorkItemResult<B> {
856+
assert!(module_config.emit_obj != EmitObj::None);
857+
856858
let incr_comp_session_dir = cgcx.incr_comp_session_dir.as_ref().unwrap();
857-
let mut object = None;
858-
if let Some(saved_file) = module.source.saved_file {
859-
let obj_out = cgcx.output_filenames.temp_path(OutputType::Object, Some(&module.name));
860-
object = Some(obj_out.clone());
861-
let source_file = in_incr_comp_dir(&incr_comp_session_dir, &saved_file);
862-
debug!(
863-
"copying pre-existing module `{}` from {:?} to {}",
864-
module.name,
865-
source_file,
866-
obj_out.display()
867-
);
868-
if let Err(err) = link_or_copy(&source_file, &obj_out) {
869-
let diag_handler = cgcx.create_diag_handler();
870-
diag_handler.err(&format!(
871-
"unable to copy {} to {}: {}",
872-
source_file.display(),
873-
obj_out.display(),
874-
err
875-
));
876-
}
859+
let obj_out = cgcx.output_filenames.temp_path(OutputType::Object, Some(&module.name));
860+
let source_file = in_incr_comp_dir(&incr_comp_session_dir, &module.source.saved_file);
861+
debug!(
862+
"copying pre-existing module `{}` from {:?} to {}",
863+
module.name,
864+
source_file,
865+
obj_out.display()
866+
);
867+
if let Err(err) = link_or_copy(&source_file, &obj_out) {
868+
let diag_handler = cgcx.create_diag_handler();
869+
diag_handler.err(&format!(
870+
"unable to copy {} to {}: {}",
871+
source_file.display(),
872+
obj_out.display(),
873+
err
874+
));
877875
}
878876

879-
assert_eq!(object.is_some(), module_config.emit_obj != EmitObj::None);
880-
881877
WorkItemResult::Compiled(CompiledModule {
882878
name: module.name,
883879
kind: ModuleKind::Regular,
884-
object,
880+
object: Some(obj_out),
885881
dwarf_object: None,
886882
bytecode: None,
887883
})

‎compiler/rustc_incremental/src/persist/load.rs

+9-11
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,16 @@ pub fn load_dep_graph(sess: &Session) -> DepGraphFuture {
162162

163163
for swp in work_products {
164164
let mut all_files_exist = true;
165-
if let Some(ref file_name) = swp.work_product.saved_file {
166-
let path = in_incr_comp_dir_sess(sess, file_name);
167-
if !path.exists() {
168-
all_files_exist = false;
169-
170-
if sess.opts.debugging_opts.incremental_info {
171-
eprintln!(
172-
"incremental: could not find file for work \
165+
let path = in_incr_comp_dir_sess(sess, &swp.work_product.saved_file);
166+
if !path.exists() {
167+
all_files_exist = false;
168+
169+
if sess.opts.debugging_opts.incremental_info {
170+
eprintln!(
171+
"incremental: could not find file for work \
173172
product: {}",
174-
path.display()
175-
);
176-
}
173+
path.display()
174+
);
177175
}
178176
}
179177

‎compiler/rustc_incremental/src/persist/save.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,15 @@ pub fn save_work_product_index(
107107
for (id, wp) in previous_work_products.iter() {
108108
if !new_work_products.contains_key(id) {
109109
work_product::delete_workproduct_files(sess, wp);
110-
debug_assert!(
111-
wp.saved_file.as_ref().map_or(true, |file_name| {
112-
!in_incr_comp_dir_sess(sess, &file_name).exists()
113-
})
114-
);
110+
debug_assert!(!in_incr_comp_dir_sess(sess, &wp.saved_file).exists());
115111
}
116112
}
117113

118114
// Check that we did not delete one of the current work-products:
119115
debug_assert!({
120116
new_work_products
121117
.iter()
122-
.flat_map(|(_, wp)| wp.saved_file.iter())
123-
.map(|name| in_incr_comp_dir_sess(sess, name))
118+
.map(|(_, wp)| in_incr_comp_dir_sess(sess, &wp.saved_file))
124119
.all(|path| path.exists())
125120
});
126121
}

‎compiler/rustc_incremental/src/persist/work_product.rs

+10-12
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub fn copy_cgu_workproduct_to_incr_comp_cache_dir(
2121
let file_name = format!("{}.o", cgu_name);
2222
let path_in_incr_dir = in_incr_comp_dir_sess(sess, &file_name);
2323
let saved_file = match link_or_copy(path, &path_in_incr_dir) {
24-
Ok(_) => Some(file_name),
24+
Ok(_) => file_name,
2525
Err(err) => {
2626
sess.warn(&format!(
2727
"error copying object file `{}` to incremental directory as `{}`: {}",
@@ -41,17 +41,15 @@ pub fn copy_cgu_workproduct_to_incr_comp_cache_dir(
4141

4242
/// Removes files for a given work product.
4343
pub fn delete_workproduct_files(sess: &Session, work_product: &WorkProduct) {
44-
if let Some(ref file_name) = work_product.saved_file {
45-
let path = in_incr_comp_dir_sess(sess, file_name);
46-
match std_fs::remove_file(&path) {
47-
Ok(()) => {}
48-
Err(err) => {
49-
sess.warn(&format!(
50-
"file-system error deleting outdated file `{}`: {}",
51-
path.display(),
52-
err
53-
));
54-
}
44+
let path = in_incr_comp_dir_sess(sess, &work_product.saved_file);
45+
match std_fs::remove_file(&path) {
46+
Ok(()) => {}
47+
Err(err) => {
48+
sess.warn(&format!(
49+
"file-system error deleting outdated file `{}`: {}",
50+
path.display(),
51+
err
52+
));
5553
}
5654
}
5755
}

‎compiler/rustc_query_system/src/dep_graph/graph.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ impl<K: DepKind> DepGraph<K> {
887887
pub struct WorkProduct {
888888
pub cgu_name: String,
889889
/// Saved file associated with this CGU.
890-
pub saved_file: Option<String>,
890+
pub saved_file: String,
891891
}
892892

893893
// Index type for `DepNodeData`'s edges.

0 commit comments

Comments
 (0)