close parallel typeck and borrowck when use query caches

Author: SparrowLii

compiler/rustc_hir_analysis/src/lib.rs

@@ -237,16 +237,20 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
         tcx.hir().for_each_module(|module| tcx.ensure().check_mod_item_types(module))
     });
 
-    // FIXME: Remove this when we implement creating `DefId`s
-    // for anon constants during their parents' typeck.
-    // Typeck all body owners in parallel will produce queries
-    // cycle errors because it may typeck on anon constants directly.
-    tcx.hir().par_body_owners(|item_def_id| {
-        let def_kind = tcx.def_kind(item_def_id);
-        if !matches!(def_kind, DefKind::AnonConst) {
-            tcx.ensure().typeck(item_def_id);
-        }
-    });
+    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.
+        // Typeck all body owners in parallel will produce queries
+        // cycle errors because it may typeck on anon constants directly.
+        tcx.hir().par_body_owners(|item_def_id| {
+            let def_kind = tcx.def_kind(item_def_id);
+            if !matches!(def_kind, DefKind::AnonConst) {
+                tcx.ensure().typeck(item_def_id);
+            }
+        });
+    }
 
     tcx.ensure().check_unused_traits(());
 

compiler/rustc_interface/src/passes.rs

@@ -790,8 +790,16 @@ 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", || {
-        tcx.hir().par_body_owners(|def_id| tcx.ensure().mir_borrowck(def_id));
+        if has_cache {
+            for def_id in tcx.hir().body_owners() {
+                tcx.ensure().mir_borrowck(def_id);
+            }
+        } else {
+            tcx.hir().par_body_owners(|def_id| tcx.ensure().mir_borrowck(def_id));
+        }
     });
 
     sess.time("MIR_effect_checking", || {

compiler/rustc_middle/src/query/on_disk_cache.rs

@@ -214,6 +214,10 @@ impl<'sess> OnDiskCache<'sess> {
         }
     }
 
+    pub fn has_cache(&self) -> bool {
+        self.serialized_data.read().is_some()
+    }
+
     /// Execute all cache promotions and release the serialized backing Mmap.
     ///
     /// Cache promotions require invoking queries, which needs to read the serialized data.