summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaan <daan@effp.org>2022-10-31 16:07:29 -0700
committerdaan <daan@effp.org>2022-10-31 16:07:29 -0700
commit65eb5c65ecbf7ddcc14a0a060585a711abaff52e (patch)
treeba0f9e35728d6794a4819f58a4a4a909c780f195
parent3ad4639aea68db870c97cb7199327a7859c3d602 (diff)
relax restriction of size to be an integral multiple of the alignment in 'alloc_aligned' as too many programs need this; see PR #584
-rw-r--r--src/alloc-posix.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/alloc-posix.c b/src/alloc-posix.c
index e1b4a28..57e15d0 100644
--- a/src/alloc-posix.c
+++ b/src/alloc-posix.c
@@ -83,13 +83,16 @@ mi_decl_nodiscard mi_decl_restrict void* mi_pvalloc(size_t size) mi_attr_noexcep
}
mi_decl_nodiscard mi_decl_restrict void* mi_aligned_alloc(size_t alignment, size_t size) mi_attr_noexcept {
- if mi_unlikely((size&(alignment-1)) != 0) { // C11 requires alignment>0 && integral multiple, see <https://en.cppreference.com/w/c/memory/aligned_alloc>
- #if MI_DEBUG > 0
- _mi_error_message(EOVERFLOW, "(mi_)aligned_alloc requires the size to be an integral multiple of the alignment (size %zu, alignment %zu)\n", size, alignment);
- #endif
- return NULL;
- }
- // C11 also requires alignment to be a power-of-two which is checked in mi_malloc_aligned
+ // C11 requires the size to be an integral multiple of the alignment, see <https://en.cppreference.com/w/c/memory/aligned_alloc>.
+ // unfortunately, it turns out quite some programs pass a size that is not an integral multiple so skip this check..
+ /* if mi_unlikely((size & (alignment - 1)) != 0) { // C11 requires alignment>0 && integral multiple, see <https://en.cppreference.com/w/c/memory/aligned_alloc>
+ #if MI_DEBUG > 0
+ _mi_error_message(EOVERFLOW, "(mi_)aligned_alloc requires the size to be an integral multiple of the alignment (size %zu, alignment %zu)\n", size, alignment);
+ #endif
+ return NULL;
+ }
+ */
+ // C11 also requires alignment to be a power-of-two (and > 0) which is checked in mi_malloc_aligned
void* p = mi_malloc_aligned(size, alignment);
mi_assert_internal(((uintptr_t)p % alignment) == 0);
return p;