Run item-types checking and item-bodies checking in parallel

Author: Zoxc

compiler/rustc_hir_analysis/src/lib.rs

@@ -95,6 +95,7 @@ mod outlives;
 pub mod structured_errors;
 mod variance;
 
+use rustc_data_structures::sync::join;
 use rustc_errors::ErrorGuaranteed;
 use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
 use rustc_fluent_macro::fluent_messages;
@@ -212,26 +213,33 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
         });
     })?;
 
-    // NOTE: This is copy/pasted in librustdoc/core.rs and should be kept in sync.
-    tcx.sess.time("item_types_checking", || {
-        tcx.hir().for_each_module(|module| tcx.ensure().check_mod_item_types(module))
+    tcx.sess.time("item_types_and_item_bodies_checking", || {
+        join(
+            || {
+                // NOTE: This is copy/pasted in librustdoc/core.rs and should be kept in sync.
+                tcx.sess.time("item_types_checking", || {
+                    tcx.hir()
+                        .par_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);
+                    }
+                });
+            },
+        )
     });
 
     // Freeze definitions as we don't add new ones at this point. This improves performance by
     // allowing lock-free access to them.
     tcx.untracked().definitions.freeze();
-
-    // 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(());
 
     if let Some(reported) = tcx.sess.has_errors() { Err(reported) } else { Ok(()) }