summaryrefslogtreecommitdiff
path: root/lib/sanitizer_common/sanitizer_win.cc
diff options
context:
space:
mode:
authorKostya Kortchinsky <kostyak@google.com>2017-06-14 17:32:26 +0000
committerKostya Kortchinsky <kostyak@google.com>2017-06-14 17:32:26 +0000
commit6cd1865e1d8bc8fd1cb62fe4ef51c8c908385609 (patch)
treeea136a4ed6ae9d22a95f3ec6ae62593a126beb7a /lib/sanitizer_common/sanitizer_win.cc
parentfccfd4523bbad39dfaf5e1a9dbf7491abbc80a22 (diff)
[sanitizer] Reverting D34152
Summary: This broke thread_local_quarantine_pthread_join.cc on some architectures, due to the overhead of the stashed regions. Reverting while figuring out the best way to deal with it. Reviewers: alekseyshl Reviewed By: alekseyshl Subscribers: llvm-commits, kubamracek Differential Revision: https://reviews.llvm.org/D34213 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@305404 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_win.cc')
-rw-r--r--lib/sanitizer_common/sanitizer_win.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/sanitizer_common/sanitizer_win.cc b/lib/sanitizer_common/sanitizer_win.cc
index 493167a19..afc3bb0ac 100644
--- a/lib/sanitizer_common/sanitizer_win.cc
+++ b/lib/sanitizer_common/sanitizer_win.cc
@@ -132,14 +132,10 @@ void UnmapOrDie(void *addr, uptr size) {
}
// We want to map a chunk of address space aligned to 'alignment'.
-void *MmapAlignedOrDie(uptr size, uptr alignment, const char *mem_type,
- uptr *padding_chunk) {
+void *MmapAlignedOrDie(uptr size, uptr alignment, const char *mem_type) {
CHECK(IsPowerOfTwo(size));
CHECK(IsPowerOfTwo(alignment));
- if (padding_chunk)
- *padding_chunk = 0;
-
// Windows will align our allocations to at least 64K.
alignment = Max(alignment, GetMmapGranularity());