[libcxx-commits] [libcxx] [libcxxabi] [libc++][NFC] Move __memory/aligned_alloc.h into src/ (PR #166172)
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Nov 3 06:49:10 PST 2025
https://github.com/philnik777 created https://github.com/llvm/llvm-project/pull/166172
This header is only ever used inside `src/`, so we might as well move it there. As a drive-by this also removes some dead code.
>From c0a6dfd3fb269c31a93d4df3b2e805481a7d16d6 Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser at berlin.de>
Date: Mon, 3 Nov 2025 15:47:48 +0100
Subject: [PATCH] [libc++][NFC] Move __memory/aligned_alloc.h into src/
---
libcxx/include/CMakeLists.txt | 1 -
libcxx/include/__config | 21 -------------------
libcxx/include/module.modulemap.in | 1 -
.../__memory => src/include}/aligned_alloc.h | 10 +++++----
libcxxabi/src/fallback_malloc.cpp | 2 +-
libcxxabi/src/stdlib_new_delete.cpp | 2 +-
6 files changed, 8 insertions(+), 29 deletions(-)
rename libcxx/{include/__memory => src/include}/aligned_alloc.h (90%)
diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index de9819cf5346a..e4ccc68cc7404 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -567,7 +567,6 @@ set(files
__mdspan/mdspan.h
__memory/addressof.h
__memory/align.h
- __memory/aligned_alloc.h
__memory/allocate_at_least.h
__memory/allocation_guard.h
__memory/allocator.h
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 357f77b7d27d6..3be35423b2bbe 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -670,27 +670,6 @@ typedef __char32_t char32_t;
# define _LIBCPP_HAS_ALIGNED_ALLOCATION 1
# endif
-// It is not yet possible to use aligned_alloc() on all Apple platforms since
-// 10.15 was the first version to ship an implementation of aligned_alloc().
-# if defined(__APPLE__)
-# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
- __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101500) || \
- (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && \
- __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 130000) || \
- (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && \
- __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 60000) || \
- (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 130000)
-# define _LIBCPP_HAS_C11_ALIGNED_ALLOC 0
-# else
-# define _LIBCPP_HAS_C11_ALIGNED_ALLOC 1
-# endif
-# elif defined(__ANDROID__) && __ANDROID_API__ < 28
-// Android only provides aligned_alloc when targeting API 28 or higher.
-# define _LIBCPP_HAS_C11_ALIGNED_ALLOC 0
-# else
-# define _LIBCPP_HAS_C11_ALIGNED_ALLOC 1
-# endif
-
# if defined(__APPLE__) || defined(__FreeBSD__)
# define _LIBCPP_WCTYPE_IS_MASK
# endif
diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap.in
index 11ab61d959e22..b4cf5cf53eaee 100644
--- a/libcxx/include/module.modulemap.in
+++ b/libcxx/include/module.modulemap.in
@@ -1634,7 +1634,6 @@ module std [system] {
module memory {
module addressof { header "__memory/addressof.h" }
module align { header "__memory/align.h" }
- module aligned_alloc { header "__memory/aligned_alloc.h" }
module allocate_at_least { header "__memory/allocate_at_least.h" }
module allocation_guard { header "__memory/allocation_guard.h" }
module allocator {
diff --git a/libcxx/include/__memory/aligned_alloc.h b/libcxx/src/include/aligned_alloc.h
similarity index 90%
rename from libcxx/include/__memory/aligned_alloc.h
rename to libcxx/src/include/aligned_alloc.h
index fb36983d9c3dc..24ca26ce04525 100644
--- a/libcxx/include/__memory/aligned_alloc.h
+++ b/libcxx/src/include/aligned_alloc.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ALIGNED_ALLOC_H
-#define _LIBCPP___MEMORY_ALIGNED_ALLOC_H
+#ifndef _LIBCPP_SRC_ALIGNED_ALLOC_H
+#define _LIBCPP_SRC_ALIGNED_ALLOC_H
#include <__config>
#include <cstdlib>
@@ -29,7 +29,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
inline _LIBCPP_HIDE_FROM_ABI void* __libcpp_aligned_alloc(std::size_t __alignment, std::size_t __size) {
# if defined(_LIBCPP_MSVCRT_LIKE)
return ::_aligned_malloc(__size, __alignment);
-# elif _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_C11_ALIGNED_ALLOC
+
+// Android only provides aligned_alloc when targeting API 28 or higher.
+# elif !defined(__ANDROID__) || __ANDROID_API__ >= 28
// aligned_alloc() requires that __size is a multiple of __alignment,
// but for C++ [new.delete.general], only states "if the value of an
// alignment argument passed to any of these functions is not a valid
@@ -60,4 +62,4 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_aligned_free(void* __ptr) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_ALIGNED_ALLOC_H
+#endif // _LIBCPP_SRC_ALIGNED_ALLOC_H
diff --git a/libcxxabi/src/fallback_malloc.cpp b/libcxxabi/src/fallback_malloc.cpp
index 75788fe9be8d9..6a261e6f009fe 100644
--- a/libcxxabi/src/fallback_malloc.cpp
+++ b/libcxxabi/src/fallback_malloc.cpp
@@ -16,7 +16,7 @@
#endif
#endif
-#include <__memory/aligned_alloc.h>
+#include "include/aligned_alloc.h" // from libc++
#include <__assert>
#include <stdlib.h> // for malloc, calloc, free
#include <string.h> // for memset
diff --git a/libcxxabi/src/stdlib_new_delete.cpp b/libcxxabi/src/stdlib_new_delete.cpp
index b5ed59958d17e..be56ddb11af97 100644
--- a/libcxxabi/src/stdlib_new_delete.cpp
+++ b/libcxxabi/src/stdlib_new_delete.cpp
@@ -8,8 +8,8 @@
#include "__cxxabi_config.h"
#include "abort_message.h"
+#include "include/aligned_alloc.h" // from libc++
#include "include/overridable_function.h" // from libc++
-#include <__memory/aligned_alloc.h>
#include <cstddef>
#include <cstdlib>
#include <new>
More information about the libcxx-commits
mailing list