Skip to content

Commit 5812b1f

Browse files
committed
Remove c_unwind from tests and fix tests
1 parent ebdfcd9 commit 5812b1f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+31
-75
lines changed

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind1.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(c_unwind)]
2-
31
#[no_mangle]
42
extern "C-unwind" fn unwind() {
53
panic!();

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
55
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
66
//@[definition,both]error-in-other-file: aborted execution
7-
#![feature(rustc_attrs, c_unwind)]
7+
#![feature(rustc_attrs)]
88

99
#[cfg_attr(any(definition, both), rustc_nounwind)]
1010
#[no_mangle]

src/tools/miri/tests/fail/panic/bad_unwind.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(c_unwind)]
2-
31
//! Unwinding when the caller ABI is "C" (without "-unwind") is UB.
42
// The opposite version (callee does not allow unwinding) is impossible to
53
// even write: MIR validation catches functions that have `UnwindContinue` but

src/tools/miri/tests/fail/terminate-terminator.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// Enable MIR inlining to ensure that `TerminatorKind::UnwindTerminate` is generated
88
// instead of just `UnwindAction::Terminate`.
99

10-
#![feature(c_unwind)]
11-
1210
struct Foo;
1311

1412
impl Drop for Foo {

src/tools/miri/tests/fail/unwind-action-terminate.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
//@normalize-stderr-test: "\| +\^+" -> "| ^"
44
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
55
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
6-
#![feature(c_unwind)]
7-
86
extern "C" fn panic_abort() {
97
panic!()
108
}

src/tools/miri/tests/panic/function_calls/exported_symbol_good_unwind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// found in this form" errors works without `-C prefer-dynamic` (`panic!` calls foreign function
33
// `__rust_start_panic`).
44
// no-prefer-dynamic
5-
#![feature(c_unwind, unboxed_closures)]
5+
#![feature(unboxed_closures)]
66

77
use std::panic;
88

tests/assembly/asm/aarch64-modifiers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ assembly-output: emit-asm
2-
//@ compile-flags: -O
2+
//@ compile-flags: -O -C panic=abort
33
//@ compile-flags: --target aarch64-unknown-linux-gnu
44
//@ needs-llvm-components: aarch64
55

tests/assembly/asm/arm-modifiers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ assembly-output: emit-asm
2-
//@ compile-flags: -O
2+
//@ compile-flags: -O -C panic=abort
33
//@ compile-flags: --target armv7-unknown-linux-gnueabihf
44
//@ compile-flags: -C target-feature=+neon
55
//@ needs-llvm-components: arm

tests/assembly/asm/x86-modifiers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ revisions: x86_64 i686
22
//@ assembly-output: emit-asm
3-
//@ compile-flags: -O
3+
//@ compile-flags: -O -C panic=abort
44
//@[x86_64] compile-flags: --target x86_64-unknown-linux-gnu
55
//@[x86_64] needs-llvm-components: x86
66
//@[i686] compile-flags: --target i686-unknown-linux-gnu

tests/assembly/simd-bitmask.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//@ [aarch64] needs-llvm-components: aarch64
1212
//@ [aarch64] min-llvm-version: 18.0
1313
//@ assembly-output: emit-asm
14-
//@ compile-flags: --crate-type=lib -O
14+
//@ compile-flags: --crate-type=lib -O -C panic=abort
1515

1616
#![feature(no_core, lang_items, repr_simd, intrinsics)]
1717
#![no_core]

0 commit comments

Comments
 (0)