[libc-commits] [libc] [libc] Add proxy headers to handle memory allocation associated with the header `#include <stdlib.h> (PR #114690)
Job Henandez Lara via libc-commits
libc-commits at lists.llvm.org
Sat Nov 2 18:16:25 PDT 2024
https://github.com/Jobhdez created https://github.com/llvm/llvm-project/pull/114690
This finishes the work from https://github.com/llvm/llvm-project/pull/114453 by adding proxy headers for `malloc`, `realloc`, `free` and `aligned_alloc`.
>From 8d779e0a0d1ad3fe0b9891be9bd7b92b9a772ba3 Mon Sep 17 00:00:00 2001
From: Job Hernandez <jobhdezlara93 at gmail.com>
Date: Sat, 2 Nov 2024 18:11:53 -0700
Subject: [PATCH 1/2] add memory allocation and free
---
libc/hdr/CMakeLists.txt | 40 +++++++++++++++++++
libc/hdr/aligned_alloc.h | 21 ++++++++++
libc/hdr/free.h | 21 ++++++++++
libc/hdr/malloc.h | 21 ++++++++++
libc/hdr/realloc.h | 21 ++++++++++
libc/src/__support/CMakeLists.txt | 3 ++
libc/src/__support/CPP/CMakeLists.txt | 8 +++-
libc/src/__support/CPP/new.cpp | 2 +-
libc/src/__support/CPP/new.h | 4 +-
libc/src/__support/CPP/string.h | 4 +-
libc/src/__support/File/CMakeLists.txt | 1 +
libc/src/__support/File/file.cpp | 1 +
libc/src/__support/char_vector.h | 5 ++-
libc/src/stdio/printf_core/CMakeLists.txt | 5 ++-
.../stdio/printf_core/vasprintf_internal.h | 5 ++-
15 files changed, 153 insertions(+), 9 deletions(-)
create mode 100644 libc/hdr/aligned_alloc.h
create mode 100644 libc/hdr/free.h
create mode 100644 libc/hdr/malloc.h
create mode 100644 libc/hdr/realloc.h
diff --git a/libc/hdr/CMakeLists.txt b/libc/hdr/CMakeLists.txt
index c63eadab6f5d77..34dd60ae629b1e 100644
--- a/libc/hdr/CMakeLists.txt
+++ b/libc/hdr/CMakeLists.txt
@@ -23,6 +23,16 @@ function(add_proxy_header_library target_name)
)
endfunction()
+add_proxy_header_library(
+ aligned_alloc
+ HDRS
+ aligned_alloc.h
+ DEPENDS
+ .stdlib_overlay.h
+ FULL_BUILD_DEPENDS
+ libc.include.stdlib
+)
+
add_proxy_header_library(
math_macros
HDRS
@@ -152,6 +162,16 @@ add_proxy_header_library(
libc.include.float
)
+add_proxy_header_library(
+ free
+ HDRS
+ free.h
+ DEPENDS
+ .stdlib_overlay.h
+ FULL_BUILD_DEPENDS
+ libc.include.stdlib
+)
+
add_proxy_header_library(
limits_macros
HDRS
@@ -170,6 +190,26 @@ add_proxy_header_library(
libc.include.link
)
+add_proxy_header_library(
+ malloc
+ HDRS
+ malloc.h
+ DEPENDS
+ .stdlib_overlay.h
+ FULL_BUILD_DEPENDS
+ libc.include.stdlib
+)
+
+add_proxy_header_library(
+ realloc
+ HDRS
+ realloc.h
+ DEPENDS
+ .stdlib_overlay.h
+ FULL_BUILD_DEPENDS
+ libc.include.stdlib
+)
+
add_proxy_header_library(
sys_auxv_macros
HDRS
diff --git a/libc/hdr/aligned_alloc.h b/libc/hdr/aligned_alloc.h
new file mode 100644
index 00000000000000..95518e5d1feed6
--- /dev/null
+++ b/libc/hdr/aligned_alloc.h
@@ -0,0 +1,21 @@
+//===-- Definition of the aligned_alloc.h proxy ---------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_HDR_ALIGNED_ALLOC_H
+#define LLVM_LIBC_HDR_ALIGNED_ALLOC_H
+
+#ifdef LIBC_FULL_BUILD
+extern "C" void* aligned_alloc(size_t, size_t);
+
+#else // Overlay mode
+
+#include "stdlib_overlay.h"
+
+#endif
+
+#endif
diff --git a/libc/hdr/free.h b/libc/hdr/free.h
new file mode 100644
index 00000000000000..43bf4e989f8a74
--- /dev/null
+++ b/libc/hdr/free.h
@@ -0,0 +1,21 @@
+//===-- Definition of the free.h proxy ------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_HDR_FREE_H
+#define LLVM_LIBC_HDR_FREE_H
+
+#ifdef LIBC_FULL_BUILD
+extern "C" void free(void*);
+
+#else // Overlay mode
+
+#include "stdlib_overlay.h"
+
+#endif
+
+#endif
diff --git a/libc/hdr/malloc.h b/libc/hdr/malloc.h
new file mode 100644
index 00000000000000..051dc743f6158b
--- /dev/null
+++ b/libc/hdr/malloc.h
@@ -0,0 +1,21 @@
+//===-- Definition of the malloc.h proxy ----------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_HDR_MALLOC_H
+#define LLVM_LIBC_HDR_MALLOC_H
+
+#ifdef LIBC_FULL_BUILD
+extern "C" void* malloc(size_t);
+
+#else // Overlay mode
+
+#include "stdlib_overlay.h"
+
+#endif
+
+#endif
diff --git a/libc/hdr/realloc.h b/libc/hdr/realloc.h
new file mode 100644
index 00000000000000..7d045225bf3dbd
--- /dev/null
+++ b/libc/hdr/realloc.h
@@ -0,0 +1,21 @@
+//===-- Definition of the realloc.h proxy ---------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_HDR_REALLOC_H
+#define LLVM_LIBC_HDR_REALLOC_H
+
+#ifdef LIBC_FULL_BUILD
+extern "C" void* realloc(void* ptr, size_t new_size);
+
+#else // Overlay mode
+
+#include "stdlib_overlay.h"
+
+#endif
+
+#endif
diff --git a/libc/src/__support/CMakeLists.txt b/libc/src/__support/CMakeLists.txt
index 14a3acff8fae93..448cfa64c32157 100644
--- a/libc/src/__support/CMakeLists.txt
+++ b/libc/src/__support/CMakeLists.txt
@@ -236,6 +236,9 @@ add_header_library(
HDRS
char_vector.h
DEPENDS
+ libc.hdr.free
+ libc.hdr.malloc
+ libc.hdr.realloc
libc.src.__support.common
)
diff --git a/libc/src/__support/CPP/CMakeLists.txt b/libc/src/__support/CPP/CMakeLists.txt
index 774668be42e56d..cc2e48bb81abf1 100644
--- a/libc/src/__support/CPP/CMakeLists.txt
+++ b/libc/src/__support/CPP/CMakeLists.txt
@@ -80,7 +80,9 @@ add_header_library(
HDRS
string.h
DEPENDS
- libc.include.stdlib
+ libc.hdr.free
+ libc.hdr.malloc
+ libc.hdr.realloc
.string_view
libc.src.__support.common
libc.src.__support.integer_to_string
@@ -199,7 +201,9 @@ add_object_library(
HDRS
new.h
DEPENDS
- libc.include.stdlib
+ libc.hdr.free
+ libc.hdr.malloc
+ libc.hdr.aligned_alloc
libc.src.__support.common
libc.src.__support.macros.properties.os
)
diff --git a/libc/src/__support/CPP/new.cpp b/libc/src/__support/CPP/new.cpp
index 8316329fb10b0b..969bd5b1231562 100644
--- a/libc/src/__support/CPP/new.cpp
+++ b/libc/src/__support/CPP/new.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "new.h"
-#include <stdlib.h> // For free, etc
+#include "hdr/free.h" // For free, etc
void operator delete(void *mem) noexcept { ::free(mem); }
diff --git a/libc/src/__support/CPP/new.h b/libc/src/__support/CPP/new.h
index c1b6b95033f84c..677185798c7703 100644
--- a/libc/src/__support/CPP/new.h
+++ b/libc/src/__support/CPP/new.h
@@ -14,7 +14,9 @@
#include "src/__support/macros/properties/os.h"
#include <stddef.h> // For size_t
-#include <stdlib.h> // For malloc, free etc.
+#include "hdr/malloc.h"
+#include "hdr/free.h"
+#include "hdr/aligned_alloc.h"
// Defining members in the std namespace is not preferred. But, we do it here
// so that we can use it to define the operator new which takes std::align_val_t
diff --git a/libc/src/__support/CPP/string.h b/libc/src/__support/CPP/string.h
index 64d4c276e84281..ba9eb2619816a5 100644
--- a/libc/src/__support/CPP/string.h
+++ b/libc/src/__support/CPP/string.h
@@ -17,7 +17,9 @@
#include "src/string/string_utils.h" // string_length
#include <stddef.h> // size_t
-#include <stdlib.h> // malloc, free
+#include "hdr/malloc.h"
+#include "hdr/free.h"
+#include "hdr/realloc.h"
namespace LIBC_NAMESPACE_DECL {
namespace cpp {
diff --git a/libc/src/__support/File/CMakeLists.txt b/libc/src/__support/File/CMakeLists.txt
index 1b390a12424d04..b04606ab27ae6b 100644
--- a/libc/src/__support/File/CMakeLists.txt
+++ b/libc/src/__support/File/CMakeLists.txt
@@ -18,6 +18,7 @@ add_object_library(
libc.src.__support.error_or
libc.hdr.types.off_t
libc.hdr.stdio_macros
+ libc.hdr.realloc
)
add_object_library(
diff --git a/libc/src/__support/File/file.cpp b/libc/src/__support/File/file.cpp
index 51811a27c1acd6..39abeed2a50a70 100644
--- a/libc/src/__support/File/file.cpp
+++ b/libc/src/__support/File/file.cpp
@@ -14,6 +14,7 @@
#include "src/__support/CPP/span.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h" // For error macros
+#include "hdr/realloc.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/__support/char_vector.h b/libc/src/__support/char_vector.h
index df109da5d81278..cfe1099795afc7 100644
--- a/libc/src/__support/char_vector.h
+++ b/libc/src/__support/char_vector.h
@@ -13,7 +13,10 @@
#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-#include <stdlib.h> // malloc, realloc, free
+
+#include "hdr/malloc.h"
+#include "hdr/free.h"
+#include "hdr/realloc.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdio/printf_core/CMakeLists.txt b/libc/src/stdio/printf_core/CMakeLists.txt
index 8172fda1e866ed..a192ea863be3f9 100644
--- a/libc/src/stdio/printf_core/CMakeLists.txt
+++ b/libc/src/stdio/printf_core/CMakeLists.txt
@@ -132,8 +132,9 @@ add_header_library(
libc.src.__support.arg_list
libc.src.stdio.printf_core.printf_main
libc.src.stdio.printf_core.writer
- libc.src.stdlib.malloc
- libc.src.stdlib.realloc
+ libc.hdr.malloc
+ libc.hdr.free
+ libc.hdr.realloc
)
if(NOT (TARGET libc.src.__support.File.file) AND LLVM_LIBC_FULL_BUILD)
diff --git a/libc/src/stdio/printf_core/vasprintf_internal.h b/libc/src/stdio/printf_core/vasprintf_internal.h
index e3448eebd302b7..47b803fdf0626c 100644
--- a/libc/src/stdio/printf_core/vasprintf_internal.h
+++ b/libc/src/stdio/printf_core/vasprintf_internal.h
@@ -11,7 +11,10 @@
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
-#include <stdlib.h> // malloc, realloc, free
+//#include <stdlib.h> // malloc, realloc, free
+#include "hdr/free.h"
+#include "hdr/malloc.h"
+#include "hdr/realloc.h"
namespace LIBC_NAMESPACE_DECL {
namespace printf_core {
>From cd6da88ed603c734bc13b14d71adff3fb8872425 Mon Sep 17 00:00:00 2001
From: Job Hernandez <jobhdezlara93 at gmail.com>
Date: Sat, 2 Nov 2024 18:12:11 -0700
Subject: [PATCH 2/2] fomat code
---
libc/hdr/aligned_alloc.h | 2 +-
libc/hdr/free.h | 2 +-
libc/hdr/malloc.h | 2 +-
libc/hdr/realloc.h | 2 +-
libc/src/__support/CPP/new.h | 6 +++---
libc/src/__support/CPP/string.h | 4 ++--
libc/src/__support/File/file.cpp | 2 +-
libc/src/__support/char_vector.h | 2 +-
libc/src/stdio/printf_core/vasprintf_internal.h | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libc/hdr/aligned_alloc.h b/libc/hdr/aligned_alloc.h
index 95518e5d1feed6..11d0d0331bd81f 100644
--- a/libc/hdr/aligned_alloc.h
+++ b/libc/hdr/aligned_alloc.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_HDR_ALIGNED_ALLOC_H
#ifdef LIBC_FULL_BUILD
-extern "C" void* aligned_alloc(size_t, size_t);
+extern "C" void *aligned_alloc(size_t, size_t);
#else // Overlay mode
diff --git a/libc/hdr/free.h b/libc/hdr/free.h
index 43bf4e989f8a74..f40593ff96aeca 100644
--- a/libc/hdr/free.h
+++ b/libc/hdr/free.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_HDR_FREE_H
#ifdef LIBC_FULL_BUILD
-extern "C" void free(void*);
+extern "C" void free(void *);
#else // Overlay mode
diff --git a/libc/hdr/malloc.h b/libc/hdr/malloc.h
index 051dc743f6158b..be002440cd25bf 100644
--- a/libc/hdr/malloc.h
+++ b/libc/hdr/malloc.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_HDR_MALLOC_H
#ifdef LIBC_FULL_BUILD
-extern "C" void* malloc(size_t);
+extern "C" void *malloc(size_t);
#else // Overlay mode
diff --git a/libc/hdr/realloc.h b/libc/hdr/realloc.h
index 7d045225bf3dbd..140d175d5462b7 100644
--- a/libc/hdr/realloc.h
+++ b/libc/hdr/realloc.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_HDR_REALLOC_H
#ifdef LIBC_FULL_BUILD
-extern "C" void* realloc(void* ptr, size_t new_size);
+extern "C" void *realloc(void *ptr, size_t new_size);
#else // Overlay mode
diff --git a/libc/src/__support/CPP/new.h b/libc/src/__support/CPP/new.h
index 677185798c7703..71e9c1e23c27df 100644
--- a/libc/src/__support/CPP/new.h
+++ b/libc/src/__support/CPP/new.h
@@ -13,10 +13,10 @@
#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/os.h"
-#include <stddef.h> // For size_t
-#include "hdr/malloc.h"
-#include "hdr/free.h"
#include "hdr/aligned_alloc.h"
+#include "hdr/free.h"
+#include "hdr/malloc.h"
+#include <stddef.h> // For size_t
// Defining members in the std namespace is not preferred. But, we do it here
// so that we can use it to define the operator new which takes std::align_val_t
diff --git a/libc/src/__support/CPP/string.h b/libc/src/__support/CPP/string.h
index ba9eb2619816a5..ea3096b6ca68c4 100644
--- a/libc/src/__support/CPP/string.h
+++ b/libc/src/__support/CPP/string.h
@@ -16,10 +16,10 @@
#include "src/string/memory_utils/inline_memset.h"
#include "src/string/string_utils.h" // string_length
-#include <stddef.h> // size_t
-#include "hdr/malloc.h"
#include "hdr/free.h"
+#include "hdr/malloc.h"
#include "hdr/realloc.h"
+#include <stddef.h> // size_t
namespace LIBC_NAMESPACE_DECL {
namespace cpp {
diff --git a/libc/src/__support/File/file.cpp b/libc/src/__support/File/file.cpp
index 39abeed2a50a70..7528780df2b0bc 100644
--- a/libc/src/__support/File/file.cpp
+++ b/libc/src/__support/File/file.cpp
@@ -8,13 +8,13 @@
#include "file.h"
+#include "hdr/realloc.h"
#include "hdr/stdio_macros.h"
#include "hdr/types/off_t.h"
#include "src/__support/CPP/new.h"
#include "src/__support/CPP/span.h"
#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h" // For error macros
-#include "hdr/realloc.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/__support/char_vector.h b/libc/src/__support/char_vector.h
index cfe1099795afc7..e44d037a9a042f 100644
--- a/libc/src/__support/char_vector.h
+++ b/libc/src/__support/char_vector.h
@@ -14,8 +14,8 @@
#include <stddef.h> // size_t
-#include "hdr/malloc.h"
#include "hdr/free.h"
+#include "hdr/malloc.h"
#include "hdr/realloc.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdio/printf_core/vasprintf_internal.h b/libc/src/stdio/printf_core/vasprintf_internal.h
index 47b803fdf0626c..26cf7b98053de4 100644
--- a/libc/src/stdio/printf_core/vasprintf_internal.h
+++ b/libc/src/stdio/printf_core/vasprintf_internal.h
@@ -11,7 +11,7 @@
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
-//#include <stdlib.h> // malloc, realloc, free
+// #include <stdlib.h> // malloc, realloc, free
#include "hdr/free.h"
#include "hdr/malloc.h"
#include "hdr/realloc.h"
More information about the libc-commits
mailing list