From 22ac8bc4a0461b4ec40d3f3f22d287514c26fa3c Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Fri, 4 Dec 2015 16:17:55 +0000 Subject: [ASan] Retire mac_ignore_invalid_free, remove some dead code. mac_ignore_invalid_free was helpful when ASan runtime used to intercept CFAllocator and sometimes corrupted its memory. This behavior had been long gone, and the flag was unused. This patch also deletes ReportMacCfReallocUnknown(), which was used by the CFAllocator realloc() wrapper. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@254722 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/sanitizer_common/sanitizer_malloc_mac.inc | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'lib/sanitizer_common/sanitizer_malloc_mac.inc') diff --git a/lib/sanitizer_common/sanitizer_malloc_mac.inc b/lib/sanitizer_common/sanitizer_malloc_mac.inc index 17d3a1349..468696a0d 100644 --- a/lib/sanitizer_common/sanitizer_malloc_mac.inc +++ b/lib/sanitizer_common/sanitizer_malloc_mac.inc @@ -184,28 +184,18 @@ void *__sanitizer_mz_valloc(malloc_zone_t *zone, size_t size) { return p; } -#define GET_ZONE_FOR_PTR(ptr) \ - malloc_zone_t *zone_ptr = malloc_zone_from_ptr(ptr); \ - const char *zone_name = (zone_ptr == 0) ? 0 : zone_ptr->zone_name - -void ALWAYS_INLINE free_common(void *context, void *ptr) { - if (!ptr) return; - // FIXME: need to retire this flag. - if (!COMMON_MALLOC_IGNORE_INVALID_FREE) { - COMMON_MALLOC_FREE(ptr); - } else { - GET_ZONE_FOR_PTR(ptr); - COMMON_MALLOC_REPORT_FREE_UNALLOCATED(ptr, zone_ptr, zone_name); - } -} - // TODO(glider): the allocation callbacks need to be refactored. extern "C" SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_mz_free(malloc_zone_t *zone, void *ptr) { - free_common(zone, ptr); + if (!ptr) return; + COMMON_MALLOC_FREE(ptr); } +#define GET_ZONE_FOR_PTR(ptr) \ + malloc_zone_t *zone_ptr = malloc_zone_from_ptr(ptr); \ + const char *zone_name = (zone_ptr == 0) ? 0 : zone_ptr->zone_name + extern "C" SANITIZER_INTERFACE_ATTRIBUTE void *__sanitizer_mz_realloc(malloc_zone_t *zone, void *ptr, size_t new_size) { -- cgit v1.2.3