summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2019-02-27 17:21:31 -0700
committerJosh Stone <jistone@redhat.com>2019-04-02 12:22:13 -0700
commitbca359141573ae80ff063cf5ce548db99d68be55 (patch)
treed3102a653cde40fd962f229cc704ab2601c174ef /src/test
parent88acdb53c52cf9d3b6a2be5252e320ef443838a6 (diff)
downloadrust-bca359141573ae80ff063cf5ce548db99d68be55.tar.gz
rust-bca359141573ae80ff063cf5ce548db99d68be55.zip
Permit unwinding through FFI by default
See #58794 for context.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/abort-on-c-abi.rs2
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");
 }