close some parallel when using cache

Author: SparrowLii

compiler/rustc_hir_analysis/src/lib.rs

@@ -187,6 +187,8 @@ pub fn provide(providers: &mut Providers) {
 pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
     let _prof_timer = tcx.sess.timer("type_check_crate");
 
+    let has_cache = tcx.query_system.on_disk_cache.as_ref().map(|cache| cache.has_cache()).unwrap_or(false);
+
     // this ensures that later parts of type checking can assume that items
     // have valid types and not error
     // FIXME(matthewjasper) We shouldn't need to use `track_errors`.
@@ -228,7 +230,11 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
 
     tcx.sess.track_errors(|| {
         tcx.sess.time("wf_checking", || {
-            tcx.hir().par_for_each_module(|module| tcx.ensure().check_mod_type_wf(module))
+            if has_cache {
+                tcx.hir().for_each_module(|module| tcx.ensure().check_mod_type_wf(module))
+            } else {
+                tcx.hir().par_for_each_module(|module| tcx.ensure().check_mod_type_wf(module))
+            }
         });
     })?;
 
@@ -237,8 +243,6 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
         tcx.hir().for_each_module(|module| tcx.ensure().check_mod_item_types(module))
     });
 
-    let has_cache = tcx.query_system.on_disk_cache.as_ref().map(|cache| cache.has_cache()).unwrap_or(false);
-
     if !has_cache {
         // FIXME: Remove this when we implement creating `DefId`s
         // for anon constants during their parents' typeck.

compiler/rustc_interface/src/passes.rs

@@ -746,6 +746,8 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
     tcx.ensure().hir_crate_items(());
     tcx.ensure().stability_index(());
 
+    let has_cache = tcx.query_system.on_disk_cache.as_ref().map(|cache| cache.has_cache()).unwrap_or(false);
+
     rustc_passes::hir_id_validator::check_crate(tcx);
 
     let sess = tcx.sess;
@@ -763,13 +765,24 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
                 CStore::from_tcx(tcx).report_unused_deps(tcx);
             },
             {
-                tcx.hir().par_for_each_module(|module| {
+                if has_cache {
+                    tcx.hir().for_each_module(|module| {
+                    tcx.ensure().check_mod_loops(module);
+                    tcx.ensure().check_mod_attrs(module);
+                    tcx.ensure().check_mod_naked_functions(module);
+                    tcx.ensure().check_mod_unstable_api_usage(module);
+                    tcx.ensure().check_mod_const_bodies(module);
+                });
+                } else {
+                    tcx.hir().par_for_each_module(|module| {
                     tcx.ensure().check_mod_loops(module);
                     tcx.ensure().check_mod_attrs(module);
                     tcx.ensure().check_mod_naked_functions(module);
                     tcx.ensure().check_mod_unstable_api_usage(module);
                     tcx.ensure().check_mod_const_bodies(module);
                 });
+                }
+
             },
             {
                 sess.time("unused_lib_feature_checking", || {
@@ -790,8 +803,6 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
     // passes are timed inside typeck
     rustc_hir_analysis::check_crate(tcx)?;
 
-    let has_cache = tcx.query_system.on_disk_cache.as_ref().map(|cache| cache.has_cache()).unwrap_or(false);
-
     sess.time("MIR_borrow_checking", || {
         if has_cache {
             for def_id in tcx.hir().body_owners() {
@@ -872,7 +883,6 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
                 });
             }
         );
-
         // This check has to be run after all lints are done processing. We don't
         // define a lint filter, as all lint checks should have finished at this point.
         sess.time("check_lint_expectations", || tcx.check_expectations(None));

compiler/rustc_lint/src/late.rs

@@ -445,8 +445,14 @@ pub fn check_crate<'tcx, T: LateLintPass<'tcx> + 'tcx>(
         },
         || {
             tcx.sess.time("module_lints", || {
+                let has_cache = tcx.query_system.on_disk_cache.as_ref().map(|cache| cache.has_cache()).unwrap_or(false);
+
                 // Run per-module lints
-                tcx.hir().par_for_each_module(|module| tcx.ensure().lint_mod(module));
+                if has_cache {
+                    tcx.hir().for_each_module(|module| tcx.ensure().lint_mod(module));
+                } else {
+                    tcx.hir().par_for_each_module(|module| tcx.ensure().lint_mod(module));
+                }
             });
         },
     );

compiler/rustc_query_system/src/query/job.rs

@@ -615,7 +615,7 @@ pub(crate) fn report_cycle<'a, D: DepKind>(
 }
 
 pub fn print_query_stack<Qcx: QueryContext>(
-    qcx: Qcx,
+    _qcx: Qcx,
     mut current_query: Option<QueryJobId>,
     handler: &Handler,
     num_frames: Option<usize>,
@@ -627,7 +627,11 @@ pub fn print_query_stack<Qcx: QueryContext>(
     let mut count_printed = 0;
     let mut count_total = 0;
 
-    let query_map = qcx.try_collect_active_jobs();
+    #[cfg(not(parallel_compiler))]
+    let query_map = _qcx.try_collect_active_jobs();
+
+    #[cfg(parallel_compiler)]
+    let query_map: Option<QueryMap<Qcx::DepKind>> = None;
 
     if let Some(ref mut file) = file {
         let _ = writeln!(file, "\n\nquery stack during panic:");