Skip to content
forked from rust-lang/rust
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e057232

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

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed
 

‎alloc/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@
165165
//
166166
// Language features:
167167
// tidy-alphabetical-start
168+
#![cfg_attr(bootstrap, feature(c_unwind))]
168169
#![cfg_attr(not(test), feature(coroutine_trait))]
169170
#![cfg_attr(test, feature(panic_update_hook))]
170171
#![cfg_attr(test, feature(test))]
171172
#![feature(allocator_internals)]
172173
#![feature(allow_internal_unstable)]
173-
#![feature(c_unwind)]
174174
#![feature(cfg_sanitize)]
175175
#![feature(const_mut_refs)]
176176
#![feature(const_precise_live_drops)]

‎core/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,13 @@
199199
//
200200
// Language features:
201201
// tidy-alphabetical-start
202+
#![cfg_attr(bootstrap, feature(c_unwind))]
202203
#![feature(abi_unadjusted)]
203204
#![feature(adt_const_params)]
204205
#![feature(allow_internal_unsafe)]
205206
#![feature(allow_internal_unstable)]
206207
#![feature(asm_const)]
207208
#![feature(auto_traits)]
208-
#![feature(c_unwind)]
209209
#![feature(cfg_sanitize)]
210210
#![feature(cfg_target_has_atomic)]
211211
#![feature(cfg_target_has_atomic_equal_alignment)]

‎panic_abort/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#![feature(std_internals)]
1515
#![feature(staged_api)]
1616
#![feature(rustc_attrs)]
17-
#![feature(c_unwind)]
17+
#![cfg_attr(bootstrap, feature(c_unwind))]
1818
#![allow(internal_features)]
1919

2020
#[cfg(target_os = "android")]

‎panic_unwind/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#![feature(rustc_attrs)]
2525
#![panic_runtime]
2626
#![feature(panic_runtime)]
27-
#![feature(c_unwind)]
27+
#![cfg_attr(bootstrap, feature(c_unwind))]
2828
// `real_imp` is unused with Miri, so silence warnings.
2929
#![cfg_attr(miri, allow(dead_code))]
3030
#![allow(internal_features)]

‎proc_macro/src/bridge/buffer.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ impl Write for Buffer {
119119
}
120120

121121
impl Drop for Buffer {
122-
#[inline]
122+
// HACK(nbdd0121): Hack to prevent LLVM < 17.0.4 from misoptimising,
123+
// change to `#[inline]` if fixed.
124+
#[inline(never)]
123125
fn drop(&mut self) {
124126
let b = self.take();
125127
(b.drop)(b);

‎std/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,12 @@
273273
//
274274
// Language features:
275275
// tidy-alphabetical-start
276+
#![cfg_attr(bootstrap, feature(c_unwind))]
276277
#![feature(alloc_error_handler)]
277278
#![feature(allocator_internals)]
278279
#![feature(allow_internal_unsafe)]
279280
#![feature(allow_internal_unstable)]
280281
#![feature(asm_experimental_arch)]
281-
#![feature(c_unwind)]
282282
#![feature(cfg_sanitizer_cfi)]
283283
#![feature(cfg_target_thread_local)]
284284
#![feature(cfi_encoding)]

‎unwind/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![unstable(feature = "panic_unwind", issue = "32837")]
33
#![feature(link_cfg)]
44
#![feature(staged_api)]
5-
#![feature(c_unwind)]
5+
#![cfg_attr(bootstrap, feature(c_unwind))]
66
#![feature(strict_provenance)]
77
#![cfg_attr(target_arch = "wasm64", feature(simd_wasm64))]
88
#![cfg_attr(not(target_env = "msvc"), feature(libc))]

0 commit comments

Comments
 (0)
Failed to load comments.