Move some other passes into a parallel block

Author: Zoxc

compiler/rustc_interface/src/passes.rs

@@ -805,29 +805,35 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
             sess.time("MIR_borrow_checking", || {
                 tcx.hir().par_body_owners(|def_id| tcx.ensure().mir_borrowck(def_id));
             });
+        },
+        {
+            sess.time("MIR_effect_checking", || {
+                for def_id in tcx.hir().body_owners() {
+                    tcx.ensure().thir_check_unsafety(def_id);
+                    if !tcx.sess.opts.unstable_opts.thir_unsafeck {
+                        rustc_mir_transform::check_unsafety::check_unsafety(tcx, def_id);
+                    }
+                    tcx.ensure().has_ffi_unwind_calls(def_id);
+
+                    // If we need to codegen, ensure that we emit all errors from
+                    // `mir_drops_elaborated_and_const_checked` now, to avoid discovering
+                    // them later during codegen.
+                    if tcx.sess.opts.output_types.should_codegen()
+                        || tcx.hir().body_const_context(def_id).is_some()
+                    {
+                        tcx.ensure().mir_drops_elaborated_and_const_checked(def_id);
+                        tcx.ensure()
+                            .unused_generic_params(ty::InstanceDef::Item(def_id.to_def_id()));
+                    }
+                }
+            });
+        },
+        {
+            sess.time("layout_testing", || layout_test::test_layout(tcx));
+            sess.time("abi_testing", || abi_test::test_abi(tcx));
         }
     );
 
-    sess.time("MIR_effect_checking", || {
-        for def_id in tcx.hir().body_owners() {
-            tcx.ensure().thir_check_unsafety(def_id);
-            if !tcx.sess.opts.unstable_opts.thir_unsafeck {
-                rustc_mir_transform::check_unsafety::check_unsafety(tcx, def_id);
-            }
-            tcx.ensure().has_ffi_unwind_calls(def_id);
-
-            // If we need to codegen, ensure that we emit all errors from
-            // `mir_drops_elaborated_and_const_checked` now, to avoid discovering
-            // them later during codegen.
-            if tcx.sess.opts.output_types.should_codegen()
-                || tcx.hir().body_const_context(def_id).is_some()
-            {
-                tcx.ensure().mir_drops_elaborated_and_const_checked(def_id);
-                tcx.ensure().unused_generic_params(ty::InstanceDef::Item(def_id.to_def_id()));
-            }
-        }
-    });
-
     if tcx.sess.opts.unstable_opts.drop_tracking_mir {
         tcx.hir().par_body_owners(|def_id| {
             if let rustc_hir::def::DefKind::Generator = tcx.def_kind(def_id) {
@@ -837,9 +843,6 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
         });
     }
 
-    sess.time("layout_testing", || layout_test::test_layout(tcx));
-    sess.time("abi_testing", || abi_test::test_abi(tcx));
-
     // Avoid overwhelming user with errors if borrow checking failed.
     // I'm not sure how helpful this is, to be honest, but it avoids a
     // lot of annoying errors in the ui tests (basically,