This repository was archived by the owner on May 28, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -398,13 +398,13 @@ pub mod __alloc_error_handler {
398398
399399 // if there is no `#[alloc_error_handler]`
400400 #[ rustc_std_internal_symbol]
401- pub unsafe extern "C-unwind" fn __rdl_oom ( size : usize , _align : usize ) -> ! {
401+ pub unsafe fn __rdl_oom ( size : usize , _align : usize ) -> ! {
402402 panic ! ( "memory allocation of {size} bytes failed" )
403403 }
404404
405405 // if there is an `#[alloc_error_handler]`
406406 #[ rustc_std_internal_symbol]
407- pub unsafe extern "C-unwind" fn __rg_oom ( size : usize , align : usize ) -> ! {
407+ pub unsafe fn __rg_oom ( size : usize , align : usize ) -> ! {
408408 let layout = unsafe { Layout :: from_size_align_unchecked ( size, align) } ;
409409 extern "Rust" {
410410 #[ lang = "oom" ]
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ pub unsafe extern "C" fn __rust_panic_cleanup(_: *mut u8) -> *mut (dyn Any + Sen
3030
3131// "Leak" the payload and shim to the relevant abort on the platform in question.
3232#[ rustc_std_internal_symbol]
33- pub unsafe extern "C-unwind" fn __rust_start_panic ( _payload : * mut & mut dyn BoxMeUp ) -> u32 {
33+ pub unsafe fn __rust_start_panic ( _payload : * mut & mut dyn BoxMeUp ) -> u32 {
3434 // Android has the ability to attach a message as part of the abort.
3535 #[ cfg( target_os = "android" ) ]
3636 android:: android_set_abort_message ( _payload) ;
Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ pub unsafe extern "C" fn __rust_panic_cleanup(payload: *mut u8) -> *mut (dyn Any
104104// Entry point for raising an exception, just delegates to the platform-specific
105105// implementation.
106106#[ rustc_std_internal_symbol]
107- pub unsafe extern "C-unwind" fn __rust_start_panic ( payload : * mut & mut dyn BoxMeUp ) -> u32 {
107+ pub unsafe fn __rust_start_panic ( payload : * mut & mut dyn BoxMeUp ) -> u32 {
108108 let payload = Box :: from_raw ( ( * payload) . take_box ( ) ) ;
109109
110110 imp:: panic ( payload)
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ extern "C" {
4747}
4848
4949#[ allow( improper_ctypes) ]
50- extern "C-unwind " {
50+ extern "Rust " {
5151 /// `payload` is passed through another layer of raw pointers as `&mut dyn Trait` is not
5252 /// FFI-safe. `BoxMeUp` lazily performs allocation only when needed (this avoids allocations
5353 /// when using the "abort" panic runtime).
You can’t perform that action at this time.
0 commit comments