kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-05 15:09:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/microsoft/mimalloc into dev

Browse source
This commit is contained in:
Daan 2022-11-25 15:44:31 -08:00
commit 2d79ae7ecf
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/alloc-aligned.c
View file

@ -56,9 +56,10 @@ static mi_decl_noinline void* mi_heap_malloc_zero_aligned_at_fallback(mi_heap_t*
} }
// .. and align within the allocation // .. and align within the allocation
uintptr_t adjust = alignment - (((uintptr_t)p + offset) & align_mask); const uintptr_t poffset = ((uintptr_t)p + offset) & align_mask;
mi_assert_internal(adjust <= alignment); const uintptr_t adjust = (poffset == 0 ? 0 : alignment - poffset);
void* aligned_p = (adjust == alignment ? p : (void*)((uintptr_t)p + adjust)); mi_assert_internal(adjust < alignment);
void* aligned_p = (void*)((uintptr_t)p + adjust);
if (aligned_p != p) { if (aligned_p != p) {
mi_page_set_has_aligned(_mi_ptr_page(p), true); mi_page_set_has_aligned(_mi_ptr_page(p), true);
} }