bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #84777 - jyn514:rustdoc-parallel, r=Mark-Simulacrum

Browse source 
Apply `--cfg parallel_compiler` when documenting

This also reverts commit 9823c2cc70 working around the bug.

Fixes https://github.com/rust-lang/rust/issues/82301.
This commit is contained in:
Yuki Okushi 2021-05-11 09:28:03 +09:00 • committed by GitHub
commit 5fc898782c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_middle/src/ty/query/mod.rs
View file

@ -232,6 +232,7 @@ macro_rules! define_callbacks {
} }
pub trait QueryEngine<'tcx>: rustc_data_structures::sync::Sync { pub trait QueryEngine<'tcx>: rustc_data_structures::sync::Sync {
#[cfg(parallel_compiler)]
unsafe fn deadlock(&'tcx self, tcx: TyCtxt<'tcx>, registry: &rustc_rayon_core::Registry); unsafe fn deadlock(&'tcx self, tcx: TyCtxt<'tcx>, registry: &rustc_rayon_core::Registry);
fn encode_query_results( fn encode_query_results(

10
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -550,12 +550,10 @@ macro_rules! define_queries_struct {
} }
impl QueryEngine<'tcx> for Queries<'tcx> { impl QueryEngine<'tcx> for Queries<'tcx> {
unsafe fn deadlock(&'tcx self, _tcx: TyCtxt<'tcx>, _registry: &rustc_rayon_core::Registry) { #[cfg(parallel_compiler)]
#[cfg(parallel_compiler)] unsafe fn deadlock(&'tcx self, tcx: TyCtxt<'tcx>, registry: &rustc_rayon_core::Registry) {
{ let tcx = QueryCtxt { tcx, queries: self };
let tcx = QueryCtxt { tcx: _tcx, queries: self }; rustc_query_system::query::deadlock(tcx, registry)
rustc_query_system::query::deadlock(tcx, _registry)
}
} }
fn encode_query_results( fn encode_query_results(

1
src/bootstrap/compile.rs
View file

@ -648,6 +648,7 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetS
} }
if builder.config.rustc_parallel { if builder.config.rustc_parallel {
cargo.rustflag("--cfg=parallel_compiler"); cargo.rustflag("--cfg=parallel_compiler");
cargo.rustdocflag("--cfg=parallel_compiler");
} }
if builder.config.rust_verify_llvm_ir { if builder.config.rust_verify_llvm_ir {
cargo.env("RUSTC_VERIFY_LLVM_IR", "1"); cargo.env("RUSTC_VERIFY_LLVM_IR", "1");