Turn write_dep_info into a regular function

It has side-effects and as such can't be cached.

Author: bjorn3

compiler/rustc_driver_impl/src/lib.rs

@@ -417,9 +417,7 @@ fn run_compiler(
                         Ok(())
                     })?;
 
-                    // Make sure the `write_dep_info` query is run for its side
-                    // effects of writing the dep-info and reporting errors.
-                    queries.global_ctxt()?.enter(|tcx| tcx.write_dep_info(()));
+                    queries.write_dep_info()?;
                 } else {
                     let krate = queries.parse()?.steal();
                     pretty::print(sess, *ppm, pretty::PrintExtra::AfterParsing { krate });
@@ -450,9 +448,7 @@ fn run_compiler(
                 return early_exit();
             }
 
-            // Make sure the `write_dep_info` query is run for its side
-            // effects of writing the dep-info and reporting errors.
-            queries.global_ctxt()?.enter(|tcx| tcx.write_dep_info(()));
+            queries.write_dep_info()?;
 
             if sess.opts.output_types.contains_key(&OutputType::DepInfo)
                 && sess.opts.output_types.len() == 1

compiler/rustc_interface/src/passes.rs

@@ -564,7 +564,7 @@ fn resolver_for_lowering<'tcx>(
     tcx.arena.alloc(Steal::new((untracked_resolver_for_lowering, Lrc::new(krate))))
 }
 
-fn write_dep_info(tcx: TyCtxt<'_>, (): ()) {
+pub(crate) fn write_dep_info(tcx: TyCtxt<'_>) {
     // Make sure name resolution and macro expansion is run for
     // the side-effect of providing a complete set of all
     // accessed files and env vars.
@@ -617,7 +617,6 @@ pub static DEFAULT_QUERY_PROVIDERS: LazyLock<Providers> = LazyLock::new(|| {
     let providers = &mut Providers::default();
     providers.analysis = analysis;
     providers.hir_crate = rustc_ast_lowering::lower_to_hir;
-    providers.write_dep_info = write_dep_info;
     providers.resolver_for_lowering = resolver_for_lowering;
     providers.early_lint_checks = early_lint_checks;
     proc_macro_decls::provide(providers);

compiler/rustc_interface/src/queries.rs

@@ -179,6 +179,13 @@ impl<'tcx> Queries<'tcx> {
         })
     }
 
+    pub fn write_dep_info(&'tcx self) -> Result<()> {
+        self.global_ctxt()?.enter(|tcx| {
+            passes::write_dep_info(tcx);
+        });
+        Ok(())
+    }
+
     pub fn ongoing_codegen(&'tcx self) -> Result<Box<dyn Any>> {
         self.global_ctxt()?.enter(|tcx| {
             // Don't do code generation if there were any errors

compiler/rustc_middle/src/query/mod.rs

@@ -1910,11 +1910,6 @@ rustc_queries! {
         arena_cache
     }
 
-    /// Write the dep-info file.
-    query write_dep_info(_: ()) -> () {
-        desc { "writing the dep-info file" }
-    }
-
     /// Do not call this query directly: invoke `normalize` instead.
     query normalize_projection_ty(
         goal: CanonicalProjectionGoal<'tcx>