diff options
| author | bors <bors@rust-lang.org> | 2019-02-28 08:52:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-28 08:52:15 +0000 |
| commit | 2aa4c46cfdd726e97360c2734835aa3515e8c858 (patch) | |
| tree | 84a07a2b096b57fb9562a7bde2d5a8dbc53d806d /src/librustc_mir/build/mod.rs | |
| parent | b270e14539a4fc749bde9d2c1ec962b878a72a05 (diff) | |
| parent | bd1f0327eebce569680b1338e0814fde57a58971 (diff) | |
| download | rust-1.33.0.tar.gz rust-1.33.0.zip | |
Auto merge of #58795 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.33.0
Revert abort on unwinding through FFI on stable This is entirely done to allow us more time for discussion about what behavior we want to specify here.
Diffstat (limited to 'src/librustc_mir/build/mod.rs')
| -rw-r--r-- | src/librustc_mir/build/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/build/mod.rs b/src/librustc_mir/build/mod.rs index 2bf2824d835..89542011aa6 100644 --- a/src/librustc_mir/build/mod.rs +++ b/src/librustc_mir/build/mod.rs @@ -611,7 +611,7 @@ fn should_abort_on_panic<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>, // unwind anyway. Don't stop them. let attrs = &tcx.get_attrs(fn_def_id); match attr::find_unwind_attr(Some(tcx.sess.diagnostic()), attrs) { - None => true, + None => false, // FIXME(#58794) Some(UnwindAttr::Allowed) => false, Some(UnwindAttr::Aborts) => true, } |