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/test | |
| 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/test')
| -rw-r--r-- | src/test/run-pass/abort-on-c-abi.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/run-pass/abort-on-c-abi.rs b/src/test/run-pass/abort-on-c-abi.rs index df94cd57186..c3991bd2e59 100644 --- a/src/test/run-pass/abort-on-c-abi.rs +++ b/src/test/run-pass/abort-on-c-abi.rs @@ -1,4 +1,5 @@ #![allow(unused_must_use)] +#![feature(unwind_attributes)] // Since we mark some ABIs as "nounwind" to LLVM, we must make sure that // we never unwind through them. @@ -10,6 +11,7 @@ use std::io::prelude::*; use std::io; use std::process::{Command, Stdio}; +#[unwind(aborts)] // FIXME(#58794) extern "C" fn panic_in_ffi() { panic!("Test"); } |