diff options
| author | bors <bors@rust-lang.org> | 2024-03-11 14:26:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-11 14:26:09 +0000 |
| commit | 65cd843ae06ad00123c131a431ed5304e4cd577a (patch) | |
| tree | 2c315ccd5465e677d3d1899dbe68f5996c41f844 /compiler/rustc_interface/src | |
| parent | d255c6a57c393db6221b1ff700daea478436f1cd (diff) | |
| parent | 55ea94402b5c57a8c937a0efdd4b86e3521dcd7f (diff) | |
| download | rust-65cd843ae06ad00123c131a431ed5304e4cd577a.tar.gz rust-65cd843ae06ad00123c131a431ed5304e4cd577a.zip | |
Auto merge of #122140 - oli-obk:track_errors13, r=davidtwco
Run a single huge par_body_owners instead of many small ones after each other. This improves parallel rustc parallelism by avoiding the bottleneck after each individual `par_body_owners` (because it needs to wait for queries to finish, so if there is one long running one, a lot of cores will be idle while waiting for the single query).
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/passes.rs | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index 4b4c1d6cf67..4cc9ffdbb2f 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -734,19 +734,22 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> { }); // passes are timed inside typeck - rustc_hir_analysis::check_crate(tcx)?; + rustc_hir_analysis::check_crate(tcx); - sess.time("MIR_borrow_checking", || { + sess.time("typeck_and_mir_analyses", || { tcx.hir().par_body_owners(|def_id| { + let def_kind = tcx.def_kind(def_id); + // 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. + if !matches!(def_kind, rustc_hir::def::DefKind::AnonConst) { + tcx.ensure().typeck(def_id); + } // Run unsafety check because it's responsible for stealing and // deallocating THIR. tcx.ensure().check_unsafety(def_id); - tcx.ensure().mir_borrowck(def_id) - }); - }); - - sess.time("MIR_effect_checking", || { - for def_id in tcx.hir().body_owners() { + tcx.ensure().mir_borrowck(def_id); if !tcx.sess.opts.unstable_opts.thir_unsafeck { rustc_mir_transform::check_unsafety::check_unsafety(tcx, def_id); } @@ -761,16 +764,16 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> { tcx.ensure().mir_drops_elaborated_and_const_checked(def_id); tcx.ensure().unused_generic_params(ty::InstanceDef::Item(def_id.to_def_id())); } - } - }); - tcx.hir().par_body_owners(|def_id| { - if tcx.is_coroutine(def_id.to_def_id()) { - tcx.ensure().mir_coroutine_witnesses(def_id); - tcx.ensure().check_coroutine_obligations(def_id); - } + if tcx.is_coroutine(def_id.to_def_id()) { + tcx.ensure().mir_coroutine_witnesses(def_id); + tcx.ensure().check_coroutine_obligations(def_id); + } + }) }); + tcx.ensure().check_unused_traits(()); + sess.time("layout_testing", || layout_test::test_layout(tcx)); sess.time("abi_testing", || abi_test::test_abi(tcx)); |
