bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #115668 - Zoxc:deadlock-msg, r=jackh726

Browse source 
Make the deadlock panic clearly refer to a deadlock
This commit is contained in:
bors 2023-09-10 03:23:02 +00:00
commit ffe131f841
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_query_system/src/query/job.rs
View file

@ -552,7 +552,9 @@ pub fn deadlock<D: DepKind>(query_map: QueryMap<D>, registry: &rayon_core::Regis
// which in turn will wait on X causing a deadlock. We have a false dependency from // which in turn will wait on X causing a deadlock. We have a false dependency from
// X to Y due to Rayon waiting and a true dependency from Y to X. The algorithm here // X to Y due to Rayon waiting and a true dependency from Y to X. The algorithm here
// only considers the true dependency and won't detect a cycle. // only considers the true dependency and won't detect a cycle.
assert!(found_cycle); if !found_cycle {
panic!("deadlock detected");
}
// FIXME: Ensure this won't cause a deadlock before we return // FIXME: Ensure this won't cause a deadlock before we return
for waiter in wakelist.into_iter() { for waiter in wakelist.into_iter() {