Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/trace_event/winheap_dump_provider_win.cc

 // Copyright 2015 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/trace_event/winheap_dump_provider_win.h"
 
 #include <windows.h>
 
+#include "base/debug/profiler.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/win/windows_version.h"
 
 namespace base {
 namespace trace_event {
 
 namespace {
 
 // Report a heap dump to a process memory dump. The |heap_info| structure
 // contains the information about this heap, and |dump_absolute_name| will be
@@ skipping 33 matching lines @@
   //   - The MSDN page for HeapLock says: "If the HeapLock function is called on
   //     a heap created with the HEAP_NO_SERIALIZATION flag, the results are
   //     undefined.". This is a problem on Windows XP where some system DLLs are
   //     known for creating heaps with this particular flag. For this reason
   //     this function should be disabled on XP.
   //
   // See https://crbug.com/487291 for more details about this.
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return false;
 
+// Disable this dump provider for the SyzyASan instrumented build
+// because they don't support the heap walking functions yet.
+#if defined(SYZYASAN)
+  if (base::debug::IsBinaryInstrumented())
+    return false;
+#endif
+
   // Retrieves the number of heaps in the current process.
   DWORD number_of_heaps = ::GetProcessHeaps(0, NULL);
   WinHeapInfo all_heap_info = {0};
 
   // Try to retrieve a handle to all the heaps owned by this process. Returns
   // false if the number of heaps has changed.
   //
   // This is inherently racy as is, but it's not something that we observe a lot
   // in Chrome, the heaps tend to be created at startup only.
   scoped_ptr<HANDLE[]> all_heaps(new HANDLE[number_of_heaps]);
@@ skipping 36 matching lines @@
     } else if ((heap_entry.wFlags & PROCESS_HEAP_REGION) != 0) {
       heap_info->committed_size += heap_entry.Region.dwCommittedSize;
     }
   }
   CHECK(::HeapUnlock(heap_info->heap_id) == TRUE);
   return true;
 }
 
 }  // namespace trace_event
 }  // namespace base