summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-08-12 18:09:44 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-08-12 18:09:44 +0000
commitcc45ee9a636f9a85ce26b3505fc80cc319b28ca5 (patch)
treee7be16285ff1f3f90d3608e47a0ad37006fc2995
parentd1a2e05991a48d64bc098372006140861388c950 (diff)
downloadbcm5719-llvm-cc45ee9a636f9a85ce26b3505fc80cc319b28ca5.tar.gz
bcm5719-llvm-cc45ee9a636f9a85ce26b3505fc80cc319b28ca5.zip
Try to fix the MSVC build now that we use /Zc:inline.
Thanks to Majnemer for the help. llvm-svn: 244786
-rw-r--r--compiler-rt/lib/asan/asan_fake_stack.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler-rt/lib/asan/asan_fake_stack.cc b/compiler-rt/lib/asan/asan_fake_stack.cc
index d20641155b8..cd8379b565d 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);
OpenPOWER on IntegriCloud