Skip to content

Commit 1cb6357

Browse files
borsbors
committed
Auto merge of #106075 - nbdd0121:ffi-unwind, r=joshtriplett
Partial stabilisation of `c_unwind` The stabilisation report is at #74990 (comment) cc `@rust-lang/wg-ffi-unwind`
2 parents d6ddee6 + c9a0be2 commit 1cb6357

File tree

32 files changed

+53
-280
lines changed

32 files changed

+53
-280
lines changed

‎compiler/rustc_feature/src/active.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ declare_features! (
311311
(active, async_closure, "1.37.0", Some(62290), None),
312312
/// Allows async functions to be declared, implemented, and used in traits.
313313
(incomplete, async_fn_in_trait, "1.66.0", Some(91611), None),
314-
/// Allows `extern "C-unwind" fn` to enable unwinding across ABI boundaries.
314+
/// Treat `extern "C"` function as nounwind.
315315
(active, c_unwind, "1.52.0", Some(74990), None),
316316
/// Allows using C-variadics.
317317
(active, c_variadic, "1.34.0", Some(44930), None),

‎compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4014,7 +4014,6 @@ declare_lint! {
40144014
/// ### Example
40154015
///
40164016
/// ```rust
4017-
/// #![feature(c_unwind)]
40184017
/// #![warn(ffi_unwind_calls)]
40194018
///
40204019
/// extern "C-unwind" {
@@ -4037,8 +4036,7 @@ declare_lint! {
40374036
/// that desire this ability it is therefore necessary to avoid such calls.
40384037
pub FFI_UNWIND_CALLS,
40394038
Allow,
4040-
"call to foreign functions or function pointers with FFI-unwind ABI",
4041-
@feature_gate = sym::c_unwind;
4039+
"call to foreign functions or function pointers with FFI-unwind ABI"
40424040
}
40434041

40444042
declare_lint! {

‎compiler/rustc_target/src/spec/abi.rs

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,9 @@ pub fn is_enabled(
148148
pub fn is_stable(name: &str) -> Result<(), AbiDisabled> {
149149
match name {
150150
// Stable
151-
"Rust" | "C" | "cdecl" | "stdcall" | "fastcall" | "aapcs" | "win64" | "sysv64"
152-
| "system" | "efiapi" => Ok(()),
151+
"Rust" | "C" | "C-unwind" | "cdecl" | "cdecl-unwind" | "stdcall" | "stdcall-unwind"
152+
| "fastcall" | "fastcall-unwind" | "aapcs" | "aapcs-unwind" | "win64" | "win64-unwind"
153+
| "sysv64" | "sysv64-unwind" | "system" | "system-unwind" | "efiapi" => Ok(()),
153154
"rust-intrinsic" => Err(AbiDisabled::Unstable {
154155
feature: sym::intrinsics,
155156
explain: "intrinsics are subject to change",
@@ -162,10 +163,18 @@ pub fn is_stable(name: &str) -> Result<(), AbiDisabled> {
162163
feature: sym::abi_vectorcall,
163164
explain: "vectorcall is experimental and subject to change",
164165
}),
166+
"vectorcall-unwind" => Err(AbiDisabled::Unstable {
167+
feature: sym::abi_vectorcall,
168+
explain: "vectorcall-unwind ABI is experimental and subject to change",
169+
}),
165170
"thiscall" => Err(AbiDisabled::Unstable {
166171
feature: sym::abi_thiscall,
167172
explain: "thiscall is experimental and subject to change",
168173
}),
174+
"thiscall-unwind" => Err(AbiDisabled::Unstable {
175+
feature: sym::abi_thiscall,
176+
explain: "thiscall-unwind ABI is experimental and subject to change",
177+
}),
169178
"rust-call" => Err(AbiDisabled::Unstable {
170179
feature: sym::unboxed_closures,
171180
explain: "rust-call ABI is subject to change",
@@ -202,46 +211,6 @@ pub fn is_stable(name: &str) -> Result<(), AbiDisabled> {
202211
feature: sym::abi_c_cmse_nonsecure_call,
203212
explain: "C-cmse-nonsecure-call ABI is experimental and subject to change",
204213
}),
205-
"C-unwind" => Err(AbiDisabled::Unstable {
206-
feature: sym::c_unwind,
207-
explain: "C-unwind ABI is experimental and subject to change",
208-
}),
209-
"stdcall-unwind" => Err(AbiDisabled::Unstable {
210-
feature: sym::c_unwind,
211-
explain: "stdcall-unwind ABI is experimental and subject to change",
212-
}),
213-
"system-unwind" => Err(AbiDisabled::Unstable {
214-
feature: sym::c_unwind,
215-
explain: "system-unwind ABI is experimental and subject to change",
216-
}),
217-
"thiscall-unwind" => Err(AbiDisabled::Unstable {
218-
feature: sym::c_unwind,
219-
explain: "thiscall-unwind ABI is experimental and subject to change",
220-
}),
221-
"cdecl-unwind" => Err(AbiDisabled::Unstable {
222-
feature: sym::c_unwind,
223-
explain: "cdecl-unwind ABI is experimental and subject to change",
224-
}),
225-
"fastcall-unwind" => Err(AbiDisabled::Unstable {
226-
feature: sym::c_unwind,
227-
explain: "fastcall-unwind ABI is experimental and subject to change",
228-
}),
229-
"vectorcall-unwind" => Err(AbiDisabled::Unstable {
230-
feature: sym::c_unwind,
231-
explain: "vectorcall-unwind ABI is experimental and subject to change",
232-
}),
233-
"aapcs-unwind" => Err(AbiDisabled::Unstable {
234-
feature: sym::c_unwind,
235-
explain: "aapcs-unwind ABI is experimental and subject to change",
236-
}),
237-
"win64-unwind" => Err(AbiDisabled::Unstable {
238-
feature: sym::c_unwind,
239-
explain: "win64-unwind ABI is experimental and subject to change",
240-
}),
241-
"sysv64-unwind" => Err(AbiDisabled::Unstable {
242-
feature: sym::c_unwind,
243-
explain: "sysv64-unwind ABI is experimental and subject to change",
244-
}),
245214
"wasm" => Err(AbiDisabled::Unstable {
246215
feature: sym::wasm_abi,
247216
explain: "wasm ABI is experimental and subject to change",

‎library/panic_unwind/src/emcc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static EXCEPTION_TYPE_INFO: TypeInfo = TypeInfo {
4747
name: b"rust_panic\0".as_ptr(),
4848
};
4949

50-
// NOTE(nbdd0121): The `canary` field will be part of stable ABI after `c_unwind` stabilization.
50+
// NOTE(nbdd0121): The `canary` field is part of stable ABI.
5151
#[repr(C)]
5252
struct Exception {
5353
// See `gcc.rs` on why this is present. We already have a static here so just use it.

‎library/panic_unwind/src/gcc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ use unwind as uw;
4848
static CANARY: u8 = 0;
4949

5050
// NOTE(nbdd0121)
51-
// Once `c_unwind` feature is stabilized, there will be ABI stability requirement
52-
// on this struct. The first two field must be `_Unwind_Exception` and `canary`,
51+
// There is an ABI stability requirement on this struct.
52+
// The first two field must be `_Unwind_Exception` and `canary`,
5353
// as it may be accessed by a different version of the std with a different compiler.
5454
#[repr(C)]
5555
struct Exception {

‎library/panic_unwind/src/seh.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ use core::mem::{self, ManuallyDrop};
5252
use core::ptr;
5353
use libc::{c_int, c_uint, c_void};
5454

55-
// NOTE(nbdd0121): The `canary` field will be part of stable ABI after `c_unwind` stabilization.
55+
// NOTE(nbdd0121): The `canary` field is part of stable ABI.
5656
#[repr(C)]
5757
struct Exception {
5858
// See `gcc.rs` on why this is present. We already have a static here so just use it.

‎tests/run-make/c-unwind-abi-catch-lib-panic/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//!
33
//! This test triggers a panic in a Rust library that our foreign function invokes. This shows
44
//! that we can unwind through the C code in that library, and catch the underlying panic.
5-
#![feature(c_unwind)]
65
76
use std::panic::{catch_unwind, AssertUnwindSafe};
87

‎tests/run-make/c-unwind-abi-catch-lib-panic/panic.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![crate_type = "staticlib"]
2-
#![feature(c_unwind)]
32

43
/// This function will panic if `x` is greater than 10.
54
///

‎tests/run-make/c-unwind-abi-catch-panic/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//! A test for calling `C-unwind` functions across foreign function boundaries.
22
//!
33
//! This test triggers a panic when calling a foreign function that calls *back* into Rust.
4-
#![feature(c_unwind)]
54
65
use std::panic::{catch_unwind, AssertUnwindSafe};
76

‎tests/run-make/foreign-double-unwind/foo.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Tests that C++ double unwinding through Rust code will be properly guarded
22
// against instead of exhibiting undefined behaviour.
33

4-
#![feature(c_unwind)]
5-
64
extern "C-unwind" {
75
fn throw_cxx_exception();
86
fn cxx_catch_callback(cb: extern "C-unwind" fn());

‎tests/run-make/foreign-exceptions/foo.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// are caught by catch_unwind. Also tests that Rust panics can unwind through
33
// C++ code.
44

5-
#![feature(c_unwind)]
6-
75
use std::panic::{catch_unwind, AssertUnwindSafe};
86

97
struct DropCheck<'a>(&'a mut bool);

‎tests/run-make/foreign-rust-exceptions/bar.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![crate_type = "cdylib"]
2-
#![feature(c_unwind)]
32

43
#[no_mangle]
54
extern "C-unwind" fn panic() {

‎tests/run-make/foreign-rust-exceptions/foo.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
#[cfg_attr(not(windows), link(name = "bar"))]
42
#[cfg_attr(windows, link(name = "bar.dll"))]
53
extern "C-unwind" {

‎tests/rustdoc-json/fn_pointer/abi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// ignore-tidy-linelength
22

33
#![feature(abi_vectorcall)]
4-
#![feature(c_unwind)]
54

65
// @is "$.index[*][?(@.name=='AbiRust')].inner.type.inner.header.abi" \"Rust\"
76
pub type AbiRust = fn();

‎tests/rustdoc-json/fns/abi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// ignore-tidy-linelength
22

33
#![feature(abi_vectorcall)]
4-
#![feature(c_unwind)]
54

65
// @is "$.index[*][?(@.name=='abi_rust')].inner.header.abi" \"Rust\"
76
pub fn abi_rust() {}

‎tests/rustdoc-json/methods/abi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// ignore-tidy-linelength
22

33
#![feature(abi_vectorcall)]
4-
#![feature(c_unwind)]
54
#![feature(no_core)]
65
#![no_core]
76

‎tests/ui/unwind-abis/feature-gate-thiscall-unwind.rs renamed to ‎tests/ui/feature-gates/feature-gate-thiscall.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
// gate-test-abi_thiscall
2-
// gate-test-c_unwind
32
// needs-llvm-components: x86
43
// compile-flags: --target=i686-pc-windows-msvc --crate-type=rlib
54
#![no_core]
65
#![feature(no_core, lang_items)]
76
#[lang="sized"]
87
trait Sized { }
98

10-
// Test that the "thiscall-unwind" ABI is feature-gated, and cannot be used when
11-
// the `c_unwind` feature gate is not used.
9+
// Test that the "thiscall" ABI is feature-gated, and cannot be used when
10+
// the `abi_thiscall` feature gate is not used.
1211

1312
extern "thiscall-unwind" fn fu() {} //~ ERROR thiscall-unwind ABI is experimental
1413
extern "thiscall" fn f() {} //~ ERROR thiscall is experimental

‎tests/ui/unwind-abis/feature-gate-thiscall-unwind.stderr renamed to ‎tests/ui/feature-gates/feature-gate-thiscall.stderr

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,114 @@
11
error[E0658]: thiscall-unwind ABI is experimental and subject to change
2-
--> $DIR/feature-gate-thiscall-unwind.rs:13:8
2+
--> $DIR/feature-gate-thiscall.rs:12:8
33
|
44
LL | extern "thiscall-unwind" fn fu() {}
55
| ^^^^^^^^^^^^^^^^^
66
|
7-
= note: see issue #74990 <https://github.com/rust-lang/rust/issues/74990> for more information
8-
= help: add `#![feature(c_unwind)]` to the crate attributes to enable
7+
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
98

109
error[E0658]: thiscall is experimental and subject to change
11-
--> $DIR/feature-gate-thiscall-unwind.rs:14:8
10+
--> $DIR/feature-gate-thiscall.rs:13:8
1211
|
1312
LL | extern "thiscall" fn f() {}
1413
| ^^^^^^^^^^
1514
|
1615
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
1716

1817
error[E0658]: thiscall is experimental and subject to change
19-
--> $DIR/feature-gate-thiscall-unwind.rs:17:12
18+
--> $DIR/feature-gate-thiscall.rs:16:12
2019
|
2120
LL | extern "thiscall" fn m();
2221
| ^^^^^^^^^^
2322
|
2423
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
2524

2625
error[E0658]: thiscall-unwind ABI is experimental and subject to change
27-
--> $DIR/feature-gate-thiscall-unwind.rs:18:12
26+
--> $DIR/feature-gate-thiscall.rs:17:12
2827
|
2928
LL | extern "thiscall-unwind" fn mu();
3029
| ^^^^^^^^^^^^^^^^^
3130
|
32-
= note: see issue #74990 <https://github.com/rust-lang/rust/issues/74990> for more information
33-
= help: add `#![feature(c_unwind)]` to the crate attributes to enable
31+
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
3432

3533
error[E0658]: thiscall is experimental and subject to change
36-
--> $DIR/feature-gate-thiscall-unwind.rs:20:12
34+
--> $DIR/feature-gate-thiscall.rs:19:12
3735
|
3836
LL | extern "thiscall" fn dm() {}
3937
| ^^^^^^^^^^
4038
|
4139
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
4240

4341
error[E0658]: thiscall-unwind ABI is experimental and subject to change
44-
--> $DIR/feature-gate-thiscall-unwind.rs:21:12
42+
--> $DIR/feature-gate-thiscall.rs:20:12
4543
|
4644
LL | extern "thiscall-unwind" fn dmu() {}
4745
| ^^^^^^^^^^^^^^^^^
4846
|
49-
= note: see issue #74990 <https://github.com/rust-lang/rust/issues/74990> for more information
50-
= help: add `#![feature(c_unwind)]` to the crate attributes to enable
47+
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
5148

5249
error[E0658]: thiscall is experimental and subject to change
53-
--> $DIR/feature-gate-thiscall-unwind.rs:26:12
50+
--> $DIR/feature-gate-thiscall.rs:25:12
5451
|
5552
LL | extern "thiscall" fn m() {}
5653
| ^^^^^^^^^^
5754
|
5855
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
5956

6057
error[E0658]: thiscall-unwind ABI is experimental and subject to change
61-
--> $DIR/feature-gate-thiscall-unwind.rs:27:12
58+
--> $DIR/feature-gate-thiscall.rs:26:12
6259
|
6360
LL | extern "thiscall-unwind" fn mu() {}
6461
| ^^^^^^^^^^^^^^^^^
6562
|
66-
= note: see issue #74990 <https://github.com/rust-lang/rust/issues/74990> for more information
67-
= help: add `#![feature(c_unwind)]` to the crate attributes to enable
63+
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
6864

6965
error[E0658]: thiscall is experimental and subject to change
70-
--> $DIR/feature-gate-thiscall-unwind.rs:31:12
66+
--> $DIR/feature-gate-thiscall.rs:30:12
7167
|
7268
LL | extern "thiscall" fn im() {}
7369
| ^^^^^^^^^^
7470
|
7571
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
7672

7773
error[E0658]: thiscall-unwind ABI is experimental and subject to change
78-
--> $DIR/feature-gate-thiscall-unwind.rs:32:12
74+
--> $DIR/feature-gate-thiscall.rs:31:12
7975
|
8076
LL | extern "thiscall-unwind" fn imu() {}
8177
| ^^^^^^^^^^^^^^^^^
8278
|
83-
= note: see issue #74990 <https://github.com/rust-lang/rust/issues/74990> for more information
84-
= help: add `#![feature(c_unwind)]` to the crate attributes to enable
79+
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
8580

8681
error[E0658]: thiscall is experimental and subject to change
87-
--> $DIR/feature-gate-thiscall-unwind.rs:35:18
82+
--> $DIR/feature-gate-thiscall.rs:34:18
8883
|
8984
LL | type TA = extern "thiscall" fn();
9085
| ^^^^^^^^^^
9186
|
9287
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
9388

9489
error[E0658]: thiscall-unwind ABI is experimental and subject to change
95-
--> $DIR/feature-gate-thiscall-unwind.rs:36:19
90+
--> $DIR/feature-gate-thiscall.rs:35:19
9691
|
9792
LL | type TAU = extern "thiscall-unwind" fn();
9893
| ^^^^^^^^^^^^^^^^^
9994
|
100-
= note: see issue #74990 <https://github.com/rust-lang/rust/issues/74990> for more information
101-
= help: add `#![feature(c_unwind)]` to the crate attributes to enable
95+
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
10296

10397
error[E0658]: thiscall is experimental and subject to change
104-
--> $DIR/feature-gate-thiscall-unwind.rs:38:8
98+
--> $DIR/feature-gate-thiscall.rs:37:8
10599
|
106100
LL | extern "thiscall" {}
107101
| ^^^^^^^^^^
108102
|
109103
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
110104

111105
error[E0658]: thiscall-unwind ABI is experimental and subject to change
112-
--> $DIR/feature-gate-thiscall-unwind.rs:39:8
106+
--> $DIR/feature-gate-thiscall.rs:38:8
113107
|
114108
LL | extern "thiscall-unwind" {}
115109
| ^^^^^^^^^^^^^^^^^
116110
|
117-
= note: see issue #74990 <https://github.com/rust-lang/rust/issues/74990> for more information
118-
= help: add `#![feature(c_unwind)]` to the crate attributes to enable
111+
= help: add `#![feature(abi_thiscall)]` to the crate attributes to enable
119112

120113
error: aborting due to 14 previous errors
121114

‎tests/ui/feature-gates/feature-gate-vectorcall.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#[lang="sized"]
77
trait Sized { }
88

9-
// Test that the "vectorcall-unwind" ABI is feature-gated, and cannot be used when
10-
// the `c_unwind` feature gate is not used.
9+
// Test that the "vectorcall" ABI is feature-gated, and cannot be used when
10+
// the `vectorcall` feature gate is not used.
1111

1212
extern "vectorcall" fn f() {} //~ ERROR vectorcall is experimental
1313

‎tests/ui/panic-runtime/auxiliary/needs-unwind.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#![crate_type = "rlib"]
55
#![no_std]
6-
#![feature(c_unwind)]
76

87
extern "C-unwind" fn foo() {}
98

0 commit comments

Comments
 (0)