nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply --cfg parallel_compiler when documenting

Browse Source 
This also reverts commit 9823c2cc70
working around the bug.
This commit is contained in:
Joshua Nelson 2021-05-01 00:06:17 -04:00
parent b52769b804
commit 1da4445109
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,6 +233,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(

8
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: _tcx, queries: self }; let tcx = QueryCtxt { 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");