]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1eb0cef 64bcbca)
Auto merge of #49826 - cuviper:rustc-main-ICE, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 28 Apr 2018 06:26:46 +0000 (06:26 +0000)
committerbors <bors@rust-lang.org>
Sat, 28 Apr 2018 06:26:46 +0000 (06:26 +0000)
commit207bc403799e4a8a04f873be94834ccc09c1412b
tree093df6cf438b7bfc2d8b79897cd8a60661e6ea2ctree | snapshot
parent1eb0cef62b3e83bf7ce6bc7d1b99e130648a55e8commit | diff
parent64bcbca81b25a8c7192ffa5a16c824c59aa2b0a2commit | diff
Auto merge of #49826 - cuviper:rustc-main-ICE, r=alexcrichton

rustc_driver: Catch ICEs on the main thread too

#48575 introduced an optimization to run rustc directly on the main thread when possible.  However, the threaded code detects panics when they `join()` to report as an ICE.  When running directly, we need to use `panic::catch_unwind` to get the same effect.

cc @ishitatsuyuki
r? @alexcrichton
Empowering everyone to build reliable and efficient software.