Revert "[ASan] Add the new __asan_mz_* symbols to asan_interface_internal.h"

Reverting r228137 to unbreak the build bots.

llvm-svn: 228172

2 files changed, 1 insertions, 19 deletions

diff --git a/compiler-rt/lib/asan/asan_interface_internal.h b/compiler-rt/lib/asan/asan_interface_internal.h
index 5fee44c4dd4..edaf44d7893 100644
--- a/compiler-rt/lib/asan/asan_interface_internal.h
+++ b/compiler-rt/lib/asan/asan_interface_internal.h
@@ -177,24 +177,6 @@ extern "C" {
   void __asan_poison_intra_object_redzone(uptr p, uptr size);
   SANITIZER_INTERFACE_ATTRIBUTE
   void __asan_unpoison_intra_object_redzone(uptr p, uptr size);
-#if SANITIZER_MAC
-  SANITIZER_INTERFACE_ATTRIBUTE
-  void * __asan_mz_calloc(void *zone, uptr nmemb, uptr size);
-  SANITIZER_INTERFACE_ATTRIBUTE
-  void __asan_mz_destroy(void* zone);
-  SANITIZER_INTERFACE_ATTRIBUTE
-  void __asan_mz_free(void *zone, void *ptr);
-  SANITIZER_INTERFACE_ATTRIBUTE
-  void * __asan_mz_malloc(void *zone, uptr size);
-  SANITIZER_INTERFACE_ATTRIBUTE
-  void * __asan_mz_memalign(void *zone, uptr align, uptr size);
-  SANITIZER_INTERFACE_ATTRIBUTE
-  void * __asan_mz_realloc(void *zone, void *ptr, uptr size);
-  SANITIZER_INTERFACE_ATTRIBUTE
-  uptr __asan_mz_size(void *zone, const void* ptr);
-  SANITIZER_INTERFACE_ATTRIBUTE
-  void * __asan_mz_valloc(void *zone, uptr size);
-#endif  // SANITIZER_MAC
 }  // extern "C"
 
 #endif  // ASAN_INTERFACE_INTERNAL_H
diff --git a/compiler-rt/lib/asan/asan_malloc_mac.cc b/compiler-rt/lib/asan/asan_malloc_mac.cc
index c145ee6e393..d7a6307c9bd 100644
--- a/compiler-rt/lib/asan/asan_malloc_mac.cc
+++ b/compiler-rt/lib/asan/asan_malloc_mac.cc
@@ -156,7 +156,7 @@ namespace {
 // wrappers, as they are basically copied from there.
 extern "C"
 SANITIZER_INTERFACE_ATTRIBUTE
-size_t __asan_mz_size(malloc_zone_t *zone, const void* ptr) {
+size_t __asan_mz_size(malloc_zone_t* zone, const void* ptr) {
   return asan_mz_size(ptr);
 }