Use SYZYASAN instead of ADDRESS_SANITIZER.

base/allocator/allocator_shim.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/allocator/allocator_shim.h"
 
 #include <config.h>
 #include "base/allocator/allocator_extension_thunks.h"
 #include "base/profiler/alternate_timer.h"
 #include "base/sysinfo.h"
@@ skipping 23 matching lines @@
   TCMALLOC,    // TCMalloc is the default allocator.
   WINHEAP,     // Windows Heap (standard Windows allocator).
   WINLFH,      // Windows LFH Heap.
 } Allocator;
 
 // This is the default allocator. This value can be changed at startup by
 // specifying environment variables shown below it.
 // See SetupSubprocessAllocator() to specify a default secondary (subprocess)
 // allocator.
 // TODO(jar): Switch to using TCMALLOC for the renderer as well.
-#if (defined(ADDRESS_SANITIZER) && defined(OS_WIN))
-// The Windows implementation of Asan requires the use of "WINHEAP".
+#if defined(SYZYASAN)
+// SyzyASan requires the use of "WINHEAP".
 static Allocator allocator = WINHEAP;
 #else
 static Allocator allocator = TCMALLOC;
 #endif
 // The names of the environment variables that can optionally control the
 // selection of the allocator.  The primary may be used to control overall
 // allocator selection, and the secondary can be used to specify an allocator
 // to use in sub-processes.
 static const char primary_name[] = "CHROME_ALLOCATOR";
 static const char secondary_name[] = "CHROME_ALLOCATOR_2";
@@ skipping 165 matching lines @@
 static void get_stats_thunk(char* buffer, int buffer_length) {
   MallocExtension::instance()->GetStats(buffer, buffer_length);
 }
 
 static void release_free_memory_thunk() {
   MallocExtension::instance()->ReleaseFreeMemory();
 }
 
 // The CRT heap initialization stub.
 extern "C" int _heap_init() {
-// Don't use the environment variable if ADDRESS_SANITIZER is defined on
-// Windows, as the implementation requires Winheap to be the allocator.
-#if !(defined(ADDRESS_SANITIZER) && defined(OS_WIN))
+// Don't use the environment variable if SYZYASAN is defined, as the
+// implementation requires Winheap to be the allocator.
+#if !defined(SYZYASAN)
   const char* environment_value = GetenvBeforeMain(primary_name);
   if (environment_value) {
     if (!stricmp(environment_value, "winheap"))
       allocator = WINHEAP;
     else if (!stricmp(environment_value, "winlfh"))
       allocator = WINLFH;
     else if (!stricmp(environment_value, "tcmalloc"))
       allocator = TCMALLOC;
   }
 #endif
@@ skipping 105 matching lines @@
   size_t primary_length = 0;
   getenv_s(&primary_length, NULL, 0, primary_name);
 
   size_t secondary_length = 0;
   char buffer[20];
   getenv_s(&secondary_length, buffer, sizeof(buffer), secondary_name);
   DCHECK_GT(sizeof(buffer), secondary_length);
   buffer[sizeof(buffer) - 1] = '\0';
 
   if (secondary_length || !primary_length) {
-    // Don't use the environment variable if ADDRESS_SANITIZER is defined on
-    // Windows, as the implementation require Winheap to be the allocator.
-#if !(defined(ADDRESS_SANITIZER) && defined(OS_WIN))
+// Don't use the environment variable if SYZYASAN is defined, as the
+// implementation require Winheap to be the allocator.
+#if !defined(SYZYASAN)
     const char* secondary_value = secondary_length ? buffer : "TCMALLOC";
     // Force renderer (or other subprocesses) to use secondary_value.
 #else
     const char* secondary_value = "WINHEAP";
 #endif
     int ret_val = _putenv_s(primary_name, secondary_value);
     DCHECK_EQ(0, ret_val);
   }
 }
 
 void* TCMallocDoMallocForTest(size_t size) {
   return do_malloc(size);
 }
 
 void TCMallocDoFreeForTest(void* ptr) {
   do_free(ptr);
 }
 
 size_t ExcludeSpaceForMarkForTest(size_t size) {
   return ExcludeSpaceForMark(size);
 }
 
 }  // namespace allocator.
 }  // namespace base.