mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix heap
All checks were successful
Build / build (push) Successful in 9m19s
Details

Browse source
This commit is contained in:
Mathieu Strypsteen 2024-12-26 10:01:52 +01:00
parent 2107b9edb3
commit 90958a96ee
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_target/src/spec/targets/x86_64_unknown_os.rs
View file

@ -2,7 +2,7 @@ use crate::spec::{Target, TargetMetadata, base};
pub(crate) fn target() -> Target {
let mut base = base::os::opts();
base.cpu = "x86-64".into();
base.cpu = "x86-64-v2".into();
Target {
llvm_target: "x86_64-unknown-none".into(),
metadata: TargetMetadata {

7
library/std/src/sys/alloc/os.rs
View file

@ -19,11 +19,8 @@ unsafe impl GlobalAlloc for System {
}
let num_blocks =
if layout.size() % 16 == 0 { layout.size() / 16 } else { (layout.size() / 16) + 1 };
HEAP_USED.fetch_add(num_blocks, Ordering::Relaxed);
let ptr = unsafe {
ptr::addr_of_mut!(HEAP_DATA.0[HEAP_USED.load(Ordering::Relaxed) - num_blocks])
as *mut u8
};
let heap_used = HEAP_USED.fetch_add(num_blocks, Ordering::SeqCst);
let ptr = unsafe { ptr::addr_of_mut!(HEAP_DATA.0[heap_used * 16]) as *mut u8 };
ptr
}