NotificationsYou must be signed in to change notification settings
Fork0
Star2

Commite057232

committed

Auto merge ofrust-lang#116088 - nbdd0121:unwind, r=Amanieu,RalfJung

Stabilise `c_unwind`Fixrust-lang#74990Fixrust-lang#115285 (that's also where FCP is happening)Marking as draft PR for now due to `compiler_builtins` issuesr? `@Amanieu`

2 parentsb6a3858 +3fc18d0 commite057232Copy full SHA for e057232

File tree

7 files changed

-7

lines changed

alloc/src
- lib.rs
core/src
- lib.rs
panic_abort/src
- lib.rs
panic_unwind/src
- lib.rs
proc_macro/src/bridge
- buffer.rs
std/src
- lib.rs
unwind/src
- lib.rs

7 files changed

-7

lines changed

`‎alloc/src/lib.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -165,12 +165,12 @@`
`165`	`165`	`//`
`166`	`166`	`// Language features:`
`167`	`167`	`// tidy-alphabetical-start`
	`168`	`+#![cfg_attr(bootstrap, feature(c_unwind))]`
`168`	`169`	`#![cfg_attr(not(test), feature(coroutine_trait))]`
`169`	`170`	`#![cfg_attr(test, feature(panic_update_hook))]`
`170`	`171`	`#![cfg_attr(test, feature(test))]`
`171`	`172`	`#![feature(allocator_internals)]`
`172`	`173`	`#![feature(allow_internal_unstable)]`
`173`		`-#![feature(c_unwind)]`
`174`	`174`	`#![feature(cfg_sanitize)]`
`175`	`175`	`#![feature(const_mut_refs)]`
`176`	`176`	`#![feature(const_precise_live_drops)]`

`‎core/src/lib.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -199,13 +199,13 @@`
`199`	`199`	`//`
`200`	`200`	`// Language features:`
`201`	`201`	`// tidy-alphabetical-start`
	`202`	`+#![cfg_attr(bootstrap, feature(c_unwind))]`
`202`	`203`	`#![feature(abi_unadjusted)]`
`203`	`204`	`#![feature(adt_const_params)]`
`204`	`205`	`#![feature(allow_internal_unsafe)]`
`205`	`206`	`#![feature(allow_internal_unstable)]`
`206`	`207`	`#![feature(asm_const)]`
`207`	`208`	`#![feature(auto_traits)]`
`208`		`-#![feature(c_unwind)]`
`209`	`209`	`#![feature(cfg_sanitize)]`
`210`	`210`	`#![feature(cfg_target_has_atomic)]`
`211`	`211`	`#![feature(cfg_target_has_atomic_equal_alignment)]`

`‎panic_abort/src/lib.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#![feature(std_internals)]`
`15`	`15`	`#![feature(staged_api)]`
`16`	`16`	`#![feature(rustc_attrs)]`
`17`		`-#![feature(c_unwind)]`
	`17`	`+#![cfg_attr(bootstrap,feature(c_unwind))]`
`18`	`18`	`#![allow(internal_features)]`
`19`	`19`
`20`	`20`	`#[cfg(target_os ="android")]`

`‎panic_unwind/src/lib.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#![feature(rustc_attrs)]`
`25`	`25`	`#![panic_runtime]`
`26`	`26`	`#![feature(panic_runtime)]`
`27`		`-#![feature(c_unwind)]`
	`27`	`+#![cfg_attr(bootstrap,feature(c_unwind))]`
`28`	`28`	// `real_imp` is unused with Miri, so silence warnings.
`29`	`29`	`#![cfg_attr(miri, allow(dead_code))]`
`30`	`30`	`#![allow(internal_features)]`

`‎proc_macro/src/bridge/buffer.rs‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,9 @@ impl Write for Buffer {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`implDropforBuffer{`
`122`		`-#[inline]`
	`122`	`+// HACK(nbdd0121): Hack to prevent LLVM < 17.0.4 from misoptimising,`
	`123`	+// change to `#[inline]` if fixed.
	`124`	`+#[inline(never)]`
`123`	`125`	`fndrop(&mutself){`
`124`	`126`	`let b =self.take();`
`125`	`127`	`(b.drop)(b);`

`‎std/src/lib.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -273,12 +273,12 @@`
`273`	`273`	`//`
`274`	`274`	`// Language features:`
`275`	`275`	`// tidy-alphabetical-start`
	`276`	`+#![cfg_attr(bootstrap, feature(c_unwind))]`
`276`	`277`	`#![feature(alloc_error_handler)]`
`277`	`278`	`#![feature(allocator_internals)]`
`278`	`279`	`#![feature(allow_internal_unsafe)]`
`279`	`280`	`#![feature(allow_internal_unstable)]`
`280`	`281`	`#![feature(asm_experimental_arch)]`
`281`		`-#![feature(c_unwind)]`
`282`	`282`	`#![feature(cfg_sanitizer_cfi)]`
`283`	`283`	`#![feature(cfg_target_thread_local)]`
`284`	`284`	`#![feature(cfi_encoding)]`

`‎unwind/src/lib.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#![unstable(feature ="panic_unwind", issue ="32837")]`
`3`	`3`	`#![feature(link_cfg)]`
`4`	`4`	`#![feature(staged_api)]`
`5`		`-#![feature(c_unwind)]`
	`5`	`+#![cfg_attr(bootstrap,feature(c_unwind))]`
`6`	`6`	`#![feature(strict_provenance)]`
`7`	`7`	`#![cfg_attr(target_arch ="wasm64", feature(simd_wasm64))]`
`8`	`8`	`#![cfg_attr(not(target_env ="msvc"), feature(libc))]`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite057232

File tree

7 files changed

7 files changed

`‎alloc/src/lib.rs‎`

`‎core/src/lib.rs‎`

`‎panic_abort/src/lib.rs‎`

`‎panic_unwind/src/lib.rs‎`

`‎proc_macro/src/bridge/buffer.rs‎`

`‎std/src/lib.rs‎`

`‎unwind/src/lib.rs‎`

0 commit comments