Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1aaab8b

Browse files
committedJun 20, 2024
Auto merge of #116088 - nbdd0121:unwind, r=Amanieu,RalfJung
Stabilise `c_unwind` Fix #74990 Fix #115285 (that's also where FCP is happening) Marking as draft PR for now due to `compiler_builtins` issues r? `@Amanieu`
2 parents 1d96de2 + bb2716e commit 1aaab8b

File tree

64 files changed

+52
-186
lines changed

Some content is hidden

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

64 files changed

+52
-186
lines changed
 

‎compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ declare_features! (
8080
(accepted, braced_empty_structs, "1.8.0", Some(29720)),
8181
/// Allows `c"foo"` literals.
8282
(accepted, c_str_literals, "1.77.0", Some(105723)),
83+
/// Allows `extern "C-unwind" fn` to enable unwinding across ABI boundaries and treat `extern "C" fn` as nounwind.
84+
(accepted, c_unwind, "CURRENT_RUSTC_VERSION", Some(74990)),
8385
/// Allows `#[cfg_attr(predicate, multiple, attributes, here)]`.
8486
(accepted, cfg_attr_multi, "1.33.0", Some(54881)),
8587
/// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests.

‎compiler/rustc_feature/src/unstable.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,6 @@ declare_features! (
363363
(unstable, async_for_loop, "1.77.0", Some(118898)),
364364
/// Allows builtin # foo() syntax
365365
(unstable, builtin_syntax, "1.71.0", Some(110680)),
366-
/// Treat `extern "C"` function as nounwind.
367-
(unstable, c_unwind, "1.52.0", Some(74990)),
368366
/// Allows using C-variadics.
369367
(unstable, c_variadic, "1.34.0", Some(44930)),
370368
/// Allows the use of `#[cfg(overflow_checks)` to check if integer overflow behaviour.

0 commit comments

Comments
 (0)