[asan] Remove system_malloc_zone

[kubamracek]

Summary

This seems to be dead code – system_malloc_zone is initialized as null and we never assign to it. This code is apparently currently never executed (in ASan), but is causes trouble for the TSan OS X port. Let's replace the checks with COMMON_MALLOC_ENTER (ENSURE_ASAN_INITED()).

[dvyukov]

glider, can you please take a look at this?
I don't understand what happens here.

[kubamracek]

ping

[glider]

looking, sorry for the delay

[glider]

LGTM

compiler-rt/trunk/lib/sanitizer_common/sanitizer_malloc_mac.inc

 #include <sys/mman.h>
 
 #include "interception/interception.h"
 #include "sanitizer_common/sanitizer_mac.h"
 
 // Similar code is used in Google Perftools,
 // http://code.google.com/p/google-perftools.
 
-// TODO(glider): do we need both zones?
-static malloc_zone_t *system_malloc_zone = 0;
 static malloc_zone_t sanitizer_zone;
 
 INTERCEPTOR(malloc_zone_t *, malloc_create_zone,
                              vm_size_t start_size, unsigned zone_flags) {
   COMMON_MALLOC_ENTER();
   uptr page_size = GetPageSizeCached();
   uptr allocated_size = RoundUpTo(sizeof(sanitizer_zone), page_size);
   COMMON_MALLOC_MEMALIGN(page_size, allocated_size);

 size_t __sanitizer_mz_size(malloc_zone_t* zone, const void* ptr) {
   COMMON_MALLOC_SIZE(ptr);
   return size;
 }
 
 extern "C"
 SANITIZER_INTERFACE_ATTRIBUTE
 void *__sanitizer_mz_malloc(malloc_zone_t *zone, uptr size) {
-  if (UNLIKELY(!COMMON_MALLOC_SANITIZER_INITIALIZED)) {
-    CHECK(system_malloc_zone);
-    return malloc_zone_malloc(system_malloc_zone, size);
-  }
+  COMMON_MALLOC_ENTER();
   COMMON_MALLOC_MALLOC(size);
   return p;
 }
 
 extern "C"
 SANITIZER_INTERFACE_ATTRIBUTE
 void *__sanitizer_mz_calloc(malloc_zone_t *zone, size_t nmemb, size_t size) {
   if (UNLIKELY(!COMMON_MALLOC_SANITIZER_INITIALIZED)) {
void *__sanitizer_mz_calloc(malloc_zone_t *zone, size_t nmemb, size_t size) {
   }
   COMMON_MALLOC_CALLOC(nmemb, size);
   return p;
 }
 
 extern "C"
 SANITIZER_INTERFACE_ATTRIBUTE
 void *__sanitizer_mz_valloc(malloc_zone_t *zone, size_t size) {
-  if (UNLIKELY(!COMMON_MALLOC_SANITIZER_INITIALIZED)) {
-    CHECK(system_malloc_zone);
-    return malloc_zone_valloc(system_malloc_zone, size);
-  }
+  COMMON_MALLOC_ENTER();
   COMMON_MALLOC_VALLOC(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 __sanitizer_mz_destroy(malloc_zone_t* zone) {
   // A no-op -- we will not be destroyed!
   Report("__sanitizer_mz_destroy() called -- ignoring\n");
 }
 
 extern "C"
 SANITIZER_INTERFACE_ATTRIBUTE
 void *__sanitizer_mz_memalign(malloc_zone_t *zone, size_t align, size_t size) {
-  if (UNLIKELY(!COMMON_MALLOC_SANITIZER_INITIALIZED)) {
-    CHECK(system_malloc_zone);
-    return malloc_zone_memalign(system_malloc_zone, align, size);
-  }
+  COMMON_MALLOC_ENTER();
   COMMON_MALLOC_MEMALIGN(align, size);
   return p;
 }
 
 // This function is currently unused, and we build with -Werror.
 #if 0
 void __sanitizer_mz_free_definite_size(
     malloc_zone_t* zone, void *ptr, size_t size) {