Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2210)

Unified Diff: base/trace_event/winheap_dump_provider_win.cc

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/trace_event/trace_event_win.cc ('k') | base/values.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/winheap_dump_provider_win.cc
diff --git a/base/trace_event/winheap_dump_provider_win.cc b/base/trace_event/winheap_dump_provider_win.cc
index 82bb01646f9f909e2fd13b8062e355314efb4b40..d56d8d348b12ef3cd8ae814a4ffbc8ceba629eab 100644
--- a/base/trace_event/winheap_dump_provider_win.cc
+++ b/base/trace_event/winheap_dump_provider_win.cc
@@ -6,6 +6,7 @@
#include <windows.h>
+#include "base/debug/profiler.h"
#include "base/trace_event/process_memory_dump.h"
#include "base/win/windows_version.h"
@@ -59,6 +60,13 @@ bool WinHeapDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
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};
« no previous file with comments | « base/trace_event/trace_event_win.cc ('k') | base/values.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698