caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "lsan: Support free_sized and free_aligned_sized from C23" (#144575)

Browse Source 
Reverts llvm/llvm-project#144415

Need to update approach to handle Apple platforms gracefully.
This commit is contained in:
Justin King
2025-06-17 11:28:14 -07:00
committed by GitHub
parent 8cd05b88ec
commit 80f3a28bbe
5 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/lib/lsan/lsan_allocator.cpp
View File

@@ -220,10 +220,6 @@ void lsan_free(void *p) {
Deallocate(p);
}
void lsan_free_sized(void *p, uptr) { Deallocate(p); }
void lsan_free_aligned_sized(void *p, uptr, uptr) { Deallocate(p); }
void *lsan_realloc(void *p, uptr size, const StackTrace &stack) {
return SetErrnoOnNull(Reallocate(stack, p, size, 1));
}

2
compiler-rt/lib/lsan/lsan_allocator.h
View File

@@ -127,8 +127,6 @@ void *lsan_aligned_alloc(uptr alignment, uptr size, const StackTrace &stack);
void *lsan_memalign(uptr alignment, uptr size, const StackTrace &stack);
void *lsan_malloc(uptr size, const StackTrace &stack);
void lsan_free(void *p);
void lsan_free_sized(void *p, uptr size);
void lsan_free_aligned_sized(void *p, uptr alignment, uptr size);
void *lsan_realloc(void *p, uptr size, const StackTrace &stack);
void *lsan_reallocarray(void *p, uptr nmemb, uptr size,
const StackTrace &stack);

18
compiler-rt/lib/lsan/lsan_interceptors.cpp
View File

@@ -84,24 +84,6 @@ INTERCEPTOR(void, free, void *p) {
lsan_free(p);
}
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);
}
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);
}
INTERCEPTOR(void*, calloc, uptr nmemb, uptr size) {
if (DlsymAlloc::Use())
return DlsymAlloc::Callocate(nmemb, size);

23
compiler-rt/lib/lsan/lsan_malloc_mac.cpp
View File

@@ -44,19 +44,16 @@ using namespace __lsan;
void *p = lsan_valloc(size, stack)
#define COMMON_MALLOC_FREE(ptr) \
lsan_free(ptr)
# define COMMON_MALLOC_FREE_SIZED(ptr, size) lsan_free_sized(ptr, size)
# define COMMON_MALLOC_FREE_ALIGNED_SIZED(ptr, alignment, size) \
lsan_free_aligned_sized(ptr, alignment, size)
# define COMMON_MALLOC_SIZE(ptr) uptr size = lsan_mz_size(ptr)
# define COMMON_MALLOC_FILL_STATS(zone, stats)
# define COMMON_MALLOC_REPORT_UNKNOWN_REALLOC(ptr, zone_ptr, zone_name) \
(void)zone_name; \
Report("mz_realloc(%p) -- attempting to realloc unallocated memory.\n", \
ptr);
# define COMMON_MALLOC_NAMESPACE __lsan
# define COMMON_MALLOC_HAS_ZONE_ENUMERATOR 0
# define COMMON_MALLOC_HAS_EXTRA_INTROSPECTION_INIT 0
#define COMMON_MALLOC_SIZE(ptr) \
uptr size = lsan_mz_size(ptr)
#define COMMON_MALLOC_FILL_STATS(zone, stats)
#define COMMON_MALLOC_REPORT_UNKNOWN_REALLOC(ptr, zone_ptr, zone_name) \
(void)zone_name; \
Report("mz_realloc(%p) -- attempting to realloc unallocated memory.\n", ptr);
#define COMMON_MALLOC_NAMESPACE __lsan
#define COMMON_MALLOC_HAS_ZONE_ENUMERATOR 0
#define COMMON_MALLOC_HAS_EXTRA_INTROSPECTION_INIT 0
# include "sanitizer_common/sanitizer_malloc_mac.inc"
#include "sanitizer_common/sanitizer_malloc_mac.inc"
#endif // SANITIZER_APPLE

15
compiler-rt/lib/sanitizer_common/sanitizer_malloc_mac.inc
View File

@@ -144,21 +144,6 @@ INTERCEPTOR(void, free, void *ptr) {
COMMON_MALLOC_FREE(ptr);
}
#ifdef COMMON_MALLOC_FREE_SIZED
INTERCEPTOR(void, free_sized, void *ptr, size_t size) {
COMMON_MALLOC_ENTER();
COMMON_MALLOC_FREE_SIZED(ptr, size);
}
#endif
#ifdef COMMON_MALLOC_FREE_ALIGNED_SIZED
INTERCEPTOR(void, free_aligned_sized, void *ptr, size_t alignment,
size_t size) {
COMMON_MALLOC_ENTER();
COMMON_MALLOC_FREE_ALIGNED_SIZED(ptr, alignment, size);
}
#endif
INTERCEPTOR(void *, realloc, void *ptr, size_t size) {
COMMON_MALLOC_ENTER();
COMMON_MALLOC_REALLOC(ptr, size);