bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remove deadlock virtual call.

Browse source
This commit is contained in:
Camille GILLOT 2021-06-28 21:33:47 +02:00
parent 81241cbf3a
commit 5b921505ef
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_interface/src/util.rs
View file

@ -10,6 +10,8 @@ use rustc_errors::registry::Registry;
use rustc_metadata::dynamic_lib::DynamicLibrary;
#[cfg(parallel_compiler)]
use rustc_middle::ty::tls;
#[cfg(parallel_compiler)]
use rustc_query_impl::QueryCtxt;
use rustc_resolve::{self, Resolver};
use rustc_session as session;
use rustc_session::config::{self, CrateType};
@ -176,7 +178,7 @@ unsafe fn handle_deadlock() {
thread::spawn(move || {
tls::enter_context(icx, |_| {
rustc_span::set_session_globals_then(session_globals, || {
tls::with(|tcx| tcx.queries.deadlock(tcx, &registry))
tls::with(|tcx| QueryCtxt::from_tcx(tcx).deadlock(&registry))
})
});
});