From 93474a9acd3a6bf58a2192c5e7eb0c9a9c11a738 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 5 Feb 2014 13:41:09 +0000 Subject: [PATCH] tsan: fix windows alignment check llvm-svn: 200838 --- compiler-rt/lib/tsan/rtl/tsan_rtl.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc index 6f80b5fed38b..04498aa6278c 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc @@ -198,7 +198,9 @@ void DontNeedShadowFor(uptr addr, uptr size) { } void MapShadow(uptr addr, uptr size) { - CHECK_EQ(addr, addr & ~((64 << 10) - 1)); // windows wants 64K alignment + // Global data is not 64K aligned, but there are no adjacent mappings, + // so we can get away with unaligned mapping. + // CHECK_EQ(addr, addr & ~((64 << 10) - 1)); // windows wants 64K alignment MmapFixedNoReserve(MemToShadow(addr), size * kShadowMultiplier); }