From: Vitaly Buka <vitalybuka@google.com>
Date: Thu, 5 Nov 2020 06:27:35 +0000 (-0800)
Subject: [LSAN] Fix preprocessor condition for MSVC
X-Git-Tag: llvmorg-13-init~7012
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d041554d1f94abed3ddd396d8af944acf63fe4e;p=platform%2Fupstream%2Fllvm.git

[LSAN] Fix preprocessor condition for MSVC
---

diff --git a/compiler-rt/lib/lsan/lsan_common.h b/compiler-rt/lib/lsan/lsan_common.h
index a26a8b3..da5d231 100644
--- a/compiler-rt/lib/lsan/lsan_common.h
+++ b/compiler-rt/lib/lsan/lsan_common.h
@@ -29,10 +29,14 @@
 // To enable LeakSanitizer on a new architecture, one needs to implement the
 // internal_clone function as well as (probably) adjust the TLS machinery for
 // the new architecture inside the sanitizer library.
+#if SANITIZER_ANDROID
 // Exclude leak-detection on arm32 for Android because `__aeabi_read_tp`
 // is missing. This caused a link error.
-#if SANITIZER_ANDROID && (__ANDROID_API__ < 28 || defined(__arm__))
+#if (__ANDROID_API__ < 28 || defined(__arm__))
 #define CAN_SANITIZE_LEAKS 0
+#else
+#define CAN_SANITIZE_LEAKS 1
+#endif
 #elif (SANITIZER_LINUX || SANITIZER_MAC) && (SANITIZER_WORDSIZE == 64) &&  \
     (defined(__x86_64__) || defined(__mips64) || defined(__aarch64__) || \
      defined(__powerpc64__) || defined(__s390x__))