bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_driver: Catch ICEs on the main thread too

Browse source
This commit is contained in:
Josh Stone 2018-04-09 17:30:43 -07:00
parent a9975254ee
commit 64bcbca81b
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_driver/lib.rs
View file

@ -1526,7 +1526,8 @@ pub fn in_rustc_thread<F, R>(f: F) -> Result<R, Box<Any + Send>>
let thread = cfg.spawn(f); let thread = cfg.spawn(f);
thread.unwrap().join() thread.unwrap().join()
} else { } else {
Ok(f()) let f = panic::AssertUnwindSafe(f);
panic::catch_unwind(f)
} }
} }