From e7863a86ada79bd39d7f48c790520ae55b5c4cfb Mon Sep 17 00:00:00 2001 From: Etienne Bergeron Date: Fri, 23 Sep 2016 15:11:41 +0000 Subject: [PATCH] [compiler-rt][lsan] Fix compiler error due to attribute (windows) Summary: Window compiler is stricter for attributes location. This patch fixes a compilation error. ``` D:\src\llvm\llvm\projects\compiler-rt\lib\lsan\lsan_thread.cc(39): error C2144: syntax error: 'int' should be preceded by ';' ``` Reviewers: rnk, majnemer Subscribers: majnemer, llvm-commits, chrisha, dberris Differential Revision: https://reviews.llvm.org/D24810 llvm-svn: 282254 --- compiler-rt/lib/lsan/lsan_thread.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/lib/lsan/lsan_thread.cc b/compiler-rt/lib/lsan/lsan_thread.cc index 8bd6d90edc925..5dff4f7481064 100644 --- a/compiler-rt/lib/lsan/lsan_thread.cc +++ b/compiler-rt/lib/lsan/lsan_thread.cc @@ -36,7 +36,7 @@ static const uptr kMaxThreads = 1 << 13; static const uptr kThreadQuarantineSize = 64; void InitializeThreadRegistry() { - static char thread_registry_placeholder[sizeof(ThreadRegistry)] ALIGNED(64); + static ALIGNED(64) char thread_registry_placeholder[sizeof(ThreadRegistry)]; thread_registry = new(thread_registry_placeholder) ThreadRegistry(CreateThreadContext, kMaxThreads, kThreadQuarantineSize); }