nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the deadlock panic clearly refer to a deadlock

Browse Source
This commit is contained in:
John Kåre Alsaker 2023-09-08 10:22:15 +02:00
parent 3d249706aa
commit 68ffa33628
1 changed files with 3 additions and 1 deletions
Show Stats 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() {