bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

catch unwind of every iter in parallel mode during wfcheck

Browse source
This commit is contained in:
SparrowLii 2022-06-27 16:39:10 +08:00
parent 3b0d4813ab
commit ec137f29c5
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_data_structures/src/sync.rs
View file

@ -21,6 +21,7 @@ use crate::owning_ref::{Erased, OwningRef};
use std::collections::HashMap; use std::collections::HashMap;
use std::hash::{BuildHasher, Hash}; use std::hash::{BuildHasher, Hash};
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use std::panic::{catch_unwind, resume_unwind, AssertUnwindSafe};
pub use std::sync::atomic::Ordering; pub use std::sync::atomic::Ordering;
pub use std::sync::atomic::Ordering::SeqCst; pub use std::sync::atomic::Ordering::SeqCst;
@ -41,7 +42,6 @@ cfg_if! {
} }
use std::ops::Add; use std::ops::Add;
use std::panic::{resume_unwind, catch_unwind, AssertUnwindSafe};
/// This is a single threaded variant of `AtomicU64`, `AtomicUsize`, etc. /// This is a single threaded variant of `AtomicU64`, `AtomicUsize`, etc.
/// It has explicit ordering arguments and is only intended for use with /// It has explicit ordering arguments and is only intended for use with
@ -339,7 +339,10 @@ cfg_if! {
t: T, t: T,
for_each: impl Fn(T::Item) + Sync + Send, for_each: impl Fn(T::Item) + Sync + Send,
) { ) {
t.into_par_iter().for_each(for_each) let ps: Vec<_> = t.into_par_iter().map(|i| catch_unwind(AssertUnwindSafe(|| for_each(i)))).collect();
ps.into_iter().for_each(|p| if let Err(panic) = p {
resume_unwind(panic)
});
} }
pub type MetadataRef = OwningRef<Box<dyn Erased + Send + Sync>, [u8]>; pub type MetadataRef = OwningRef<Box<dyn Erased + Send + Sync>, [u8]>;