From cc45ee9a636f9a85ce26b3505fc80cc319b28ca5 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 12 Aug 2015 18:09:44 +0000 Subject: [PATCH] Try to fix the MSVC build now that we use /Zc:inline. Thanks to Majnemer for the help. llvm-svn: 244786 --- compiler-rt/lib/asan/asan_fake_stack.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler-rt/lib/asan/asan_fake_stack.cc b/compiler-rt/lib/asan/asan_fake_stack.cc index d206411..cd8379b 100644 --- a/compiler-rt/lib/asan/asan_fake_stack.cc +++ b/compiler-rt/lib/asan/asan_fake_stack.cc @@ -80,7 +80,9 @@ void FakeStack::PoisonAll(u8 magic) { magic); } +#if !defined(_MSC_VER) || defined(__clang__) ALWAYS_INLINE USED +#endif FakeFrame *FakeStack::Allocate(uptr stack_size_log, uptr class_id, uptr real_stack) { CHECK_LT(class_id, kNumberOfSizeClasses); -- 2.7.4