summaryrefslogtreecommitdiff
path: root/lib/sanitizer_common/sanitizer_allocator.cc
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2013-05-29 10:41:53 +0000
committerAlexey Samsonov <samsonov@google.com>2013-05-29 10:41:53 +0000
commit845abaf0e3287a6abb1c6b6200d4e6b96896f929 (patch)
tree1d8e06106bb22edafb7fa143316b149514b5a092 /lib/sanitizer_common/sanitizer_allocator.cc
parentc91a93897a14fcd68bdd835ad6c6a4d12d2f78e6 (diff)
[sanitizer] Use raw check in internal allocator to prevent self-deadlocks. Try to fix Windows build.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@182840 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_allocator.cc')
-rw-r--r--lib/sanitizer_common/sanitizer_allocator.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
index efb06cf84..2975073cf 100644
--- a/lib/sanitizer_common/sanitizer_allocator.cc
+++ b/lib/sanitizer_common/sanitizer_allocator.cc
@@ -46,7 +46,7 @@ InternalAllocator *internal_allocator() {
#else // SANITIZER_GO
-static char internal_alloc_placeholder[sizeof(InternalAllocator)] ALIGNED(64);
+static ALIGNED(64) char internal_alloc_placeholder[sizeof(InternalAllocator)];
static atomic_uint8_t internal_allocator_initialized;
static StaticSpinMutex internal_alloc_init_mu;