[sanitizer] Use raw check in internal allocator to prevent self-deadlocks. Try to fix Windows build.

llvm-svn: 182840

2 files changed, 3 insertions, 3 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;
 
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h b/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h
index 62d19627fdc..5b24bfdafa3 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h
@@ -44,10 +44,10 @@ typedef SizeClassAllocatorLocalCache<PrimaryInternalAllocator>
 // We don't want our internal allocator to do any map/unmap operations.
 struct CrashOnMapUnmap {
   void OnMap(uptr p, uptr size) const {
-    CHECK(0 && "Unexpected mmap in InternalAllocator!");
+    RAW_CHECK_MSG(0, "Unexpected mmap in InternalAllocator!");
   }
   void OnUnmap(uptr p, uptr size) const {
-    CHECK(0 && "Unexpected unmap in InternalAllocator!");
+    RAW_CHECK_MSG(0, "Unexpected munmap in InternalAllocator!");
   }
 };