diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs
index 5cccab893bb35..333786f0ca38f 100644
--- a/compiler/rustc_interface/src/util.rs
+++ b/compiler/rustc_interface/src/util.rs
@@ -192,7 +192,18 @@ pub(crate) fn run_in_thread_pool_with_globals<F: FnOnce(CurrentGcx) -> R + Send,
// `TyCtxt` TLS reference here.
let query_map = current_gcx2.access(|gcx| {
tls::enter_context(&tls::ImplicitCtxt::new(gcx), || {
- tls::with(|tcx| QueryCtxt::new(tcx).collect_active_jobs())
+ tls::with(|tcx| {
+ 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();
+ }
+ }
+ })
})
});
let query_map = FromDyn::from(query_map);
@@ -201,7 +212,7 @@ pub(crate) fn run_in_thread_pool_with_globals<F: FnOnce(CurrentGcx) -> R + Send,
.name("rustc query cycle handler".to_string())
.spawn(move || {
let on_panic = defer(|| {
- eprintln!("query cycle handler thread panicked, aborting process");
+ eprintln!("internal compiler error: query cycle handler thread panicked, aborting process");
// We need to abort here as we failed to resolve the deadlock,
// otherwise the compiler could just hang,
process::abort();
diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs
index 2b8457ace8ee7..cafe16ce77b9f 100644
--- a/compiler/rustc_query_impl/src/plumbing.rs
+++ b/compiler/rustc_query_impl/src/plumbing.rs
@@ -79,14 +79,20 @@ impl QueryContext for QueryCtxt<'_> {
tls::with_related_context(self.tcx, |icx| icx.query)
}
- fn collect_active_jobs(self) -> QueryMap {
+ /// Returns a query map representing active query jobs.
+ /// It returns an incomplete map as an error if it fails
+ /// to take locks.
+ fn collect_active_jobs(self) -> Result<QueryMap, QueryMap> {
let mut jobs = QueryMap::default();
+ let mut complete = true;
for collect in super::TRY_COLLECT_ACTIVE_JOBS.iter() {
- collect(self.tcx, &mut jobs);
+ if collect(self.tcx, &mut jobs).is_none() {
+ complete = false;
+ }
}
- jobs
+ if complete { Ok(jobs) } else { Err(jobs) }
}
// Interactions with on_disk_cache
@@ -139,7 +145,12 @@ impl QueryContext for QueryCtxt<'_> {
}
fn depth_limit_error(self, job: QueryJobId) {
- let (info, depth) = job.find_dep_kind_root(self.collect_active_jobs());
+ // FIXME: `collect_active_jobs` expects no locks to be held, which doesn't hold for this call.
+ let query_map = match self.collect_active_jobs() {
+ Ok(query_map) => query_map,
+ Err(query_map) => query_map,
+ };
+ let (info, depth) = job.find_dep_kind_root(query_map);
let suggested_limit = match self.recursion_limit() {
Limit(0) => Limit(2),
@@ -677,7 +688,7 @@ macro_rules! define_queries {
}
}
- pub(crate) fn try_collect_active_jobs<'tcx>(tcx: TyCtxt<'tcx>, qmap: &mut QueryMap) {
+ pub(crate) fn try_collect_active_jobs<'tcx>(tcx: TyCtxt<'tcx>, qmap: &mut QueryMap) -> Option<()> {
let make_query = |tcx, key| {
let kind = rustc_middle::dep_graph::dep_kinds::$name;
let name = stringify!($name);
@@ -697,6 +708,7 @@ macro_rules! define_queries {
stringify!($name)
);
}
+ res
}
pub(crate) fn alloc_self_profile_query_strings<'tcx>(
@@ -756,7 +768,7 @@ macro_rules! define_queries {
// These arrays are used for iteration and can't be indexed by `DepKind`.
- const TRY_COLLECT_ACTIVE_JOBS: &[for<'tcx> fn(TyCtxt<'tcx>, &mut QueryMap)] =
+ const TRY_COLLECT_ACTIVE_JOBS: &[for<'tcx> fn(TyCtxt<'tcx>, &mut QueryMap) -> Option<()>] =
&[$(query_impl::$name::try_collect_active_jobs),*];
const ALLOC_SELF_PROFILE_QUERY_STRINGS: &[
diff --git a/compiler/rustc_query_system/src/query/job.rs b/compiler/rustc_query_system/src/query/job.rs
index 37b305d0a8b50..f0cb378f471e8 100644
--- a/compiler/rustc_query_system/src/query/job.rs
+++ b/compiler/rustc_query_system/src/query/job.rs
@@ -588,7 +588,12 @@ pub fn print_query_stack<Qcx: QueryContext>(
// state if it was responsible for triggering the panic.
let mut count_printed = 0;
let mut count_total = 0;
- let query_map = qcx.collect_active_jobs();
+
+ // Make use of a partial query map if we fail to take locks collecting active queries.
+ let query_map = match qcx.collect_active_jobs() {
+ Ok(query_map) => query_map,
+ Err(query_map) => query_map,
+ };
if let Some(ref mut file) = file {
let _ = writeln!(file, "\n\nquery stack during panic:");
diff --git a/compiler/rustc_query_system/src/query/mod.rs b/compiler/rustc_query_system/src/query/mod.rs
index 2ed0c810b7516..0d0c66aa978ef 100644
--- a/compiler/rustc_query_system/src/query/mod.rs
+++ b/compiler/rustc_query_system/src/query/mod.rs
@@ -86,7 +86,7 @@ pub trait QueryContext: HasDepContext {
/// Get the query information from the TLS context.
fn current_query_job(self) -> Option<QueryJobId>;
- fn collect_active_jobs(self) -> QueryMap;
+ fn collect_active_jobs(self) -> Result<QueryMap, QueryMap>;
/// Load a side effect associated to the node in the previous session.
fn load_side_effect(
diff --git a/compiler/rustc_query_system/src/query/plumbing.rs b/compiler/rustc_query_system/src/query/plumbing.rs
index 7578cb5e2aebd..a5ecc50421e77 100644
--- a/compiler/rustc_query_system/src/query/plumbing.rs
+++ b/compiler/rustc_query_system/src/query/plumbing.rs
@@ -250,8 +250,11 @@ where
Q: QueryConfig<Qcx>,
Qcx: QueryContext,
{
- let error =
- try_execute.find_cycle_in_stack(qcx.collect_active_jobs(), &qcx.current_query_job(), span);
+ // Ensure there was no errors collecting all active jobs.
+ // We need the complete map to ensure we find a cycle to break.
+ let query_map = qcx.collect_active_jobs().expect("failed to collect active queries");
+
+ let error = try_execute.find_cycle_in_stack(query_map, &qcx.current_query_job(), span);
(mk_cycle(query, qcx, error), None)
}