summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/sanitizer_common/sanitizer_allocator64.h
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2012-06-25 14:31:59 +0000
committerKostya Serebryany <kcc@google.com>2012-06-25 14:31:59 +0000
commit6bbb5140cc09397a4951084098e0bf76a7ef62d9 (patch)
tree10f34c93d7d5f5add55f790bb240229b8b3cae1c /compiler-rt/lib/sanitizer_common/sanitizer_allocator64.h
parent540c3d23df1fa0c0e369be768e9ff08bd87799ae (diff)
downloadbcm5719-llvm-6bbb5140cc09397a4951084098e0bf76a7ef62d9.tar.gz
bcm5719-llvm-6bbb5140cc09397a4951084098e0bf76a7ef62d9.zip
[tsan] fix the build
llvm-svn: 159137
Diffstat (limited to 'compiler-rt/lib/sanitizer_common/sanitizer_allocator64.h')
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_allocator64.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator64.h b/compiler-rt/lib/sanitizer_common/sanitizer_allocator64.h
index 444a561eeca..8df9bdcdf95 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator64.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator64.h
@@ -149,9 +149,7 @@ class SizeClassAllocator64 {
LifoListNode *free_list;
uptr allocated_user; // Bytes allocated for user memory.
uptr allocated_meta; // Bytes allocated for metadata.
- char padding[kCacheLineSize -
- sizeof(mutex) - sizeof(free_list) -
- sizeof(allocated_user) - sizeof(allocated_meta)];
+ char padding[kCacheLineSize - 4 * sizeof(uptr)];
};
COMPILER_CHECK(sizeof(RegionInfo) == kCacheLineSize);
OpenPOWER on IntegriCloud