diff options
| author | bors <bors@rust-lang.org> | 2022-11-14 00:07:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-14 00:07:19 +0000 |
| commit | 338cfd3cce448f576dbac48438018fc65cef8982 (patch) | |
| tree | 074ffcc17a460ce224072c1544a41b35eaa33d34 /library/alloc/src/alloc.rs | |
| parent | 7b513af6c4b39b86f70b19fbd1a2dc72aa485d5c (diff) | |
| parent | 01a2a57ac9c7920521cda5a93ffaa5ed0552206b (diff) | |
| download | rust-338cfd3cce448f576dbac48438018fc65cef8982.tar.gz rust-338cfd3cce448f576dbac48438018fc65cef8982.zip | |
Auto merge of #103858 - Mark-Simulacrum:bump-bootstrap, r=pietroalbini
Bump bootstrap compiler to 1.66 This PR: - Bumps version placeholders to release - Bumps to latest beta - cfg-steps code r? `@pietroalbini`
Diffstat (limited to 'library/alloc/src/alloc.rs')
| -rw-r--r-- | library/alloc/src/alloc.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs index 8c6663569a5..e5fbfc55761 100644 --- a/library/alloc/src/alloc.rs +++ b/library/alloc/src/alloc.rs @@ -28,20 +28,16 @@ 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] - #[cfg_attr(not(bootstrap), rustc_nounwind)] - #[cfg_attr(bootstrap, rustc_allocator_nounwind)] + #[rustc_nounwind] fn __rust_alloc(size: usize, align: usize) -> *mut u8; #[rustc_deallocator] - #[cfg_attr(not(bootstrap), rustc_nounwind)] - #[cfg_attr(bootstrap, rustc_allocator_nounwind)] + #[rustc_nounwind] fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize); #[rustc_reallocator] - #[cfg_attr(not(bootstrap), rustc_nounwind)] - #[cfg_attr(bootstrap, rustc_allocator_nounwind)] + #[rustc_nounwind] fn __rust_realloc(ptr: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8; #[rustc_allocator_zeroed] - #[cfg_attr(not(bootstrap), rustc_nounwind)] - #[cfg_attr(bootstrap, rustc_allocator_nounwind)] + #[rustc_nounwind] fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8; } |