Fill out links_from_incr_cache in cg_clif

Author: saethlin

compiler/rustc_codegen_cranelift/src/driver/aot.rs

@@ -456,27 +456,39 @@ fn reuse_workproduct_for_cgu(
         &work_product.saved_files.get("o").expect("no saved object file in work product"),
     );
 
-    if let Err(err) = rustc_fs_util::link_or_copy(&source_file_regular, &obj_out_regular) {
-        return Err(format!(
-            "unable to copy {} to {}: {}",
-            source_file_regular.display(),
-            obj_out_regular.display(),
-            err
-        ));
-    }
-    let obj_out_global_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 = 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)
-        {
+    let mut links_from_incr_cache = Vec::new();
+
+    match rustc_fs_util::link_or_copy(&source_file_regular, &obj_out_regular) {
+        Err(err) => {
             return Err(format!(
                 "unable to copy {} to {}: {}",
                 source_file_regular.display(),
                 obj_out_regular.display(),
                 err
             ));
         }
+        Ok(_) => {
+            links_from_incr_cache.push(source_file_regular);
+        }
+    }
+
+    let obj_out_global_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 = rustc_incremental::in_incr_comp_dir_sess(&tcx.sess, asm_o);
+        match rustc_fs_util::link_or_copy(&source_file_global_asm, &obj_out_global_asm) {
+            Err(err) => {
+                return Err(format!(
+                    "unable to copy {} to {}: {}",
+                    source_file_global_asm.display(),
+                    obj_out_global_asm.display(),
+                    err
+                ));
+            }
+            Ok(_) => {
+                links_from_incr_cache.push(source_file_global_asm);
+            }
+        }
         true
     } else {
         false
@@ -491,7 +503,7 @@ fn reuse_workproduct_for_cgu(
             bytecode: None,
             assembly: None,
             llvm_ir: None,
-            links_from_incr_cache: Vec::new(),
+            links_from_incr_cache: links_from_incr_cache.clone(),
         },
         module_global_asm: has_global_asm.then(|| CompiledModule {
             name: cgu.name().to_string(),
@@ -501,7 +513,7 @@ fn reuse_workproduct_for_cgu(
             bytecode: None,
             assembly: None,
             llvm_ir: None,
-            links_from_incr_cache: Vec::new(),
+            links_from_incr_cache,
         }),
         existing_work_product: Some((cgu.work_product_id(), work_product)),
     })