[libcxx-commits] [libcxx] [libcxx] Use `aligned_alloc` for testing instead of `posix_memalign` (PR #101748)
Joseph Huber via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Aug 5 12:41:57 PDT 2024
https://github.com/jhuber6 updated https://github.com/llvm/llvm-project/pull/101748
>From d3a23e2687c6fc20c80a012dad3c5a1dd704b698 Mon Sep 17 00:00:00 2001
From: Joseph Huber <huberjn at outlook.com>
Date: Fri, 2 Aug 2024 13:49:58 -0500
Subject: [PATCH] [libcxx] Use `aligned_alloc` for testing instead of
`posix_memalign`
Summary:
The `aligned_alloc` function is the C11 replacement for
`posix_memalign`. We should favor the C standard over the POSIX standard
so more C library implementations can run the tests.
---
.../support.dynamic/new_faligned_allocation.pass.cpp | 2 +-
libcxx/test/support/count_new.h | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp b/libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp
index 69c46f00fb65d..87f4783e12973 100644
--- a/libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp
+++ b/libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**) {
test_allocations(64, 64);
// Size being a multiple of alignment also needs to be supported.
test_allocations(64, 32);
- // When aligned allocation is implemented using posix_memalign,
+ // When aligned allocation is implemented using aligned_alloc,
// that function requires a minimum alignment of sizeof(void*).
// Check that we can also create overaligned allocations with
// an alignment argument less than sizeof(void*).
diff --git a/libcxx/test/support/count_new.h b/libcxx/test/support/count_new.h
index 0a95e05b72421..c55f64401dbdf 100644
--- a/libcxx/test/support/count_new.h
+++ b/libcxx/test/support/count_new.h
@@ -460,6 +460,9 @@ inline void* alocate_aligned_impl(std::size_t size, std::align_val_t align) {
void* ret = nullptr;
# ifdef USE_ALIGNED_ALLOC
ret = _aligned_malloc(size, alignment);
+# elif TEST_STD_VER >= 17
+ size_t rounded_size = (size + align - 1) & ~(alignment - 1);
+ ret = aligned_alloc(alignment, size > rounded_size ? size : rounded_size);
# else
assert(posix_memalign(&ret, std::max(alignment, sizeof(void*)), size) != EINVAL);
# endif
More information about the libcxx-commits
mailing list