diff options
author | Dmitry Vyukov <dvyukov@google.com> | 2016-07-20 12:50:49 +0000 |
---|---|---|
committer | Dmitry Vyukov <dvyukov@google.com> | 2016-07-20 12:50:49 +0000 |
commit | e35e7c00b5c7e7ee5e24d537b80cb0d34cebb038 (patch) | |
tree | 2932c3dfe57d9ea6f911908abdaaa3feb9ddb711 /lib/sanitizer_common/sanitizer_win.cc | |
parent | 5868c7a6f6a24276c37a762e19e13f22d57017c9 (diff) |
tsan: fix windows build
It's only asan that installs vectored SEH handler to map memory lazily.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@276112 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_win.cc')
-rw-r--r-- | lib/sanitizer_common/sanitizer_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sanitizer_common/sanitizer_win.cc b/lib/sanitizer_common/sanitizer_win.cc index f762731cb..d8975595a 100644 --- a/lib/sanitizer_common/sanitizer_win.cc +++ b/lib/sanitizer_common/sanitizer_win.cc @@ -173,10 +173,10 @@ void *MmapFixedNoReserve(uptr fixed_addr, uptr size, const char *name) { // FIXME: is this really "NoReserve"? On Win32 this does not matter much, // but on Win64 it does. (void)name; // unsupported -#if SANITIZER_WINDOWS64 - // On Windows64, use MEM_COMMIT would result in error +#if !SANITIZER_GO && SANITIZER_WINDOWS64 + // On asan/Windows64, use MEM_COMMIT would result in error // 1455:ERROR_COMMITMENT_LIMIT. - // We use exception handler to commit page on demand. + // Asan uses exception handler to commit page on demand. void *p = VirtualAlloc((LPVOID)fixed_addr, size, MEM_RESERVE, PAGE_READWRITE); #else void *p = VirtualAlloc((LPVOID)fixed_addr, size, MEM_RESERVE | MEM_COMMIT, |