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

Address comments

Browse source
This commit is contained in:
John Kåre Alsaker 2025-03-21 08:09:42 +01:00
parent 157008d711
commit 34244c1477
5 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,15 +193,16 @@ pub(crate) fn run_in_thread_pool_with_globals<F: FnOnce(CurrentGcx) -> R + Send,
let query_map = current_gcx2.access(|gcx| {
tls::enter_context(&tls::ImplicitCtxt::new(gcx), || {
tls::with(|tcx| {
let (query_map, complete) = QueryCtxt::new(tcx).collect_active_jobs();
if !complete {
// There was an unexpected error collecting all active jobs, which we need
// to find cycles to break.
// We want to avoid panicking in the deadlock handler, so we abort instead.
eprintln!("internal compiler error: failed to get query map in deadlock handler, aborting process");
process::abort();
match QueryCtxt::new(tcx).collect_active_jobs() {
Ok(query_map) => query_map,
Err(_) => {
// There was an unexpected error collecting all active jobs, which we need
// to find cycles to break.
// We want to avoid panicking in the deadlock handler, so we abort instead.
eprintln!("internal compiler error: failed to get query map in deadlock handler, aborting process");
process::abort();
}
}
query_map
})
})
});