diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-05-29 10:41:53 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-05-29 10:41:53 +0000 |
| commit | 25ad5a6735055a0f3a78fe132328d9a3ac2b8fcb (patch) | |
| tree | 5c9fb6ed98a4f826143f63d641fbb8a87f9ca88e /compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc | |
| parent | e6154323132a29f82bef72127241c5ce7e502042 (diff) | |
| download | bcm5719-llvm-25ad5a6735055a0f3a78fe132328d9a3ac2b8fcb.tar.gz bcm5719-llvm-25ad5a6735055a0f3a78fe132328d9a3ac2b8fcb.zip | |
[sanitizer] Use raw check in internal allocator to prevent self-deadlocks. Try to fix Windows build.
llvm-svn: 182840
Diffstat (limited to 'compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc')
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc index efb06cf8460..2975073cf6c 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc +++ b/compiler-rt/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; |

