[compiler-rt] lsan: fix macos build after #144604 (PR #144818)
Justin King via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 18 18:08:05 PDT 2025
https://github.com/jcking created https://github.com/llvm/llvm-project/pull/144818
None
>From c808a332e4c46a600cf41124d67b8d1a072be052 Mon Sep 17 00:00:00 2001
From: Justin King <jcking at google.com>
Date: Wed, 18 Jun 2025 18:07:16 -0700
Subject: [PATCH] lsan: fix macos build after #144604
Signed-off-by: Justin King <jcking at google.com>
---
compiler-rt/lib/lsan/lsan_interceptors.cpp | 58 +++++++++++-----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/compiler-rt/lib/lsan/lsan_interceptors.cpp b/compiler-rt/lib/lsan/lsan_interceptors.cpp
index 6da9d0d9d24f8..ea6f739d66422 100644
--- a/compiler-rt/lib/lsan/lsan_interceptors.cpp
+++ b/compiler-rt/lib/lsan/lsan_interceptors.cpp
@@ -84,35 +84,6 @@ INTERCEPTOR(void, free, void *p) {
lsan_free(p);
}
-# if SANITIZER_INTERCEPT_FREE_SIZED
-INTERCEPTOR(void, free_sized, void *p, uptr size) {
- if (UNLIKELY(!p))
- return;
- if (DlsymAlloc::PointerIsMine(p))
- return DlsymAlloc::Free(p);
- ENSURE_LSAN_INITED;
- lsan_free_sized(p, size);
-}
-# define LSAN_MAYBE_INTERCEPT_FREE_SIZED INTERCEPT_FUNCTION(free_sized)
-# else
-# define LSAN_MAYBE_INTERCEPT_FREE_SIZED
-# endif
-
-# if SANITIZER_INTERCEPT_FREE_ALIGNED_SIZED
-INTERCEPTOR(void, free_aligned_sized, void *p, uptr alignment, uptr size) {
- if (UNLIKELY(!p))
- return;
- if (DlsymAlloc::PointerIsMine(p))
- return DlsymAlloc::Free(p);
- ENSURE_LSAN_INITED;
- lsan_free_aligned_sized(p, alignment, size);
-}
-# define LSAN_MAYBE_INTERCEPT_FREE_ALIGNED_SIZED \
- INTERCEPT_FUNCTION(free_aligned_sized)
-# else
-# define LSAN_MAYBE_INTERCEPT_FREE_ALIGNED_SIZED
-# endif
-
INTERCEPTOR(void*, calloc, uptr nmemb, uptr size) {
if (DlsymAlloc::Use())
return DlsymAlloc::Callocate(nmemb, size);
@@ -148,6 +119,35 @@ INTERCEPTOR(void*, valloc, uptr size) {
}
#endif // !SANITIZER_APPLE
+# if SANITIZER_INTERCEPT_FREE_SIZED
+INTERCEPTOR(void, free_sized, void *p, uptr size) {
+ if (UNLIKELY(!p))
+ return;
+ if (DlsymAlloc::PointerIsMine(p))
+ return DlsymAlloc::Free(p);
+ ENSURE_LSAN_INITED;
+ lsan_free_sized(p, size);
+}
+# define LSAN_MAYBE_INTERCEPT_FREE_SIZED INTERCEPT_FUNCTION(free_sized)
+# else
+# define LSAN_MAYBE_INTERCEPT_FREE_SIZED
+# endif
+
+# if SANITIZER_INTERCEPT_FREE_ALIGNED_SIZED
+INTERCEPTOR(void, free_aligned_sized, void *p, uptr alignment, uptr size) {
+ if (UNLIKELY(!p))
+ return;
+ if (DlsymAlloc::PointerIsMine(p))
+ return DlsymAlloc::Free(p);
+ ENSURE_LSAN_INITED;
+ lsan_free_aligned_sized(p, alignment, size);
+}
+# define LSAN_MAYBE_INTERCEPT_FREE_ALIGNED_SIZED \
+ INTERCEPT_FUNCTION(free_aligned_sized)
+# else
+# define LSAN_MAYBE_INTERCEPT_FREE_ALIGNED_SIZED
+# endif
+
#if SANITIZER_INTERCEPT_MEMALIGN
INTERCEPTOR(void*, memalign, uptr alignment, uptr size) {
ENSURE_LSAN_INITED;
More information about the llvm-commits
mailing list