Skip to content

Commit 365aaa8

Browse files
committed
Explicitly implement DynSync and DynSend for TyCtxt
1 parent f16c81f commit 365aaa8

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

compiler/rustc_middle/src/ty/context.rs

+13-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ use rustc_data_structures::profiling::SelfProfilerRef;
3939
use rustc_data_structures::sharded::{IntoPointer, ShardedHashMap};
4040
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
4141
use rustc_data_structures::steal::Steal;
42-
use rustc_data_structures::sync::{FreezeReadGuard, Lock, WorkerLocal};
42+
use rustc_data_structures::sync::{self, FreezeReadGuard, Lock, WorkerLocal};
43+
#[cfg(parallel_compiler)]
44+
use rustc_data_structures::sync::{DynSend, DynSync};
4345
use rustc_data_structures::unord::UnordSet;
4446
use rustc_errors::{
4547
DecorateLint, DiagnosticBuilder, DiagnosticMessage, ErrorGuaranteed, MultiSpan,
@@ -552,6 +554,16 @@ pub struct TyCtxt<'tcx> {
552554
gcx: &'tcx GlobalCtxt<'tcx>,
553555
}
554556

557+
// Explicitly implement `DynSync` and `DynSend` for `TyCtxt` to short circuit trait resolution.
558+
#[cfg(parallel_compiler)]
559+
unsafe impl DynSend for TyCtxt<'_> {}
560+
#[cfg(parallel_compiler)]
561+
unsafe impl DynSync for TyCtxt<'_> {}
562+
fn _assert_tcx_fields() {
563+
sync::assert_dyn_sync::<&'_ GlobalCtxt<'_>>();
564+
sync::assert_dyn_send::<&'_ GlobalCtxt<'_>>();
565+
}
566+
555567
impl<'tcx> Deref for TyCtxt<'tcx> {
556568
type Target = &'tcx GlobalCtxt<'tcx>;
557569
#[inline(always)]

0 commit comments

Comments
 (0)