OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #79172 - a1phyr:cold_abort, r=Mark-Simulacrum

Browse Source 
Add #[cold] attribute to `std::process::abort` and `alloc::alloc::handle_alloc_error`
This commit is contained in:
bors 2020-11-23 02:25:13 +00:00
commit f32459c7ba
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/alloc/src/alloc.rs
View File

@ -360,6 +360,7 @@ extern "Rust" {
#[stable(feature = "global_alloc", since = "1.28.0")] #[stable(feature = "global_alloc", since = "1.28.0")]
#[cfg(not(test))] #[cfg(not(test))]
#[rustc_allocator_nounwind] #[rustc_allocator_nounwind]
#[cold]
pub fn handle_alloc_error(layout: Layout) -> ! { pub fn handle_alloc_error(layout: Layout) -> ! {
unsafe { unsafe {
__rust_alloc_error_handler(layout.size(), layout.align()); __rust_alloc_error_handler(layout.size(), layout.align());

1
library/std/src/process.rs
View File

@ -1779,6 +1779,7 @@ pub fn exit(code: i32) -> ! {
/// ///
/// [panic hook]: crate::panic::set_hook /// [panic hook]: crate::panic::set_hook
#[stable(feature = "process_abort", since = "1.17.0")] #[stable(feature = "process_abort", since = "1.17.0")]
#[cold]
pub fn abort() -> ! { pub fn abort() -> ! {
crate::sys::abort_internal(); crate::sys::abort_internal();
} }