diff options
| author | Ralf Jung <post@ralfj.de> | 2022-10-06 12:33:29 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2022-10-11 22:47:31 +0200 |
| commit | 2b50cd18772d3db523070d418dc0411b885a3ff4 (patch) | |
| tree | d7f1d8f99c343eef5f23e23a4441a26bd2d8ca01 /library/alloc/src | |
| parent | db0597f5619d5ed93feca28e61226d3581cc7867 (diff) | |
| download | rust-2b50cd18772d3db523070d418dc0411b885a3ff4.tar.gz rust-2b50cd18772d3db523070d418dc0411b885a3ff4.zip | |
rename rustc_allocator_nounwind to rustc_nounwind
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/alloc.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs index 80b067812ba..8187517ccfb 100644 --- a/library/alloc/src/alloc.rs +++ b/library/alloc/src/alloc.rs @@ -28,16 +28,20 @@ extern "Rust" { // The rustc fork of LLVM 14 and earlier also special-cases these function names to be able to optimize them // like `malloc`, `realloc`, and `free`, respectively. #[rustc_allocator] - #[rustc_allocator_nounwind] + #[cfg_attr(not(bootstrap), rustc_nounwind)] + #[cfg_attr(bootstrap, rustc_allocator_nounwind)] fn __rust_alloc(size: usize, align: usize) -> *mut u8; #[rustc_deallocator] - #[rustc_allocator_nounwind] + #[cfg_attr(not(bootstrap), rustc_nounwind)] + #[cfg_attr(bootstrap, rustc_allocator_nounwind)] fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize); #[rustc_reallocator] - #[rustc_allocator_nounwind] + #[cfg_attr(not(bootstrap), rustc_nounwind)] + #[cfg_attr(bootstrap, rustc_allocator_nounwind)] fn __rust_realloc(ptr: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8; #[rustc_allocator_zeroed] - #[rustc_allocator_nounwind] + #[cfg_attr(not(bootstrap), rustc_nounwind)] + #[cfg_attr(bootstrap, rustc_allocator_nounwind)] fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8; } |
