tsan: fix active mapping selection
authorDmitry Vyukov <dvyukov@google.com>
Wed, 11 Aug 2021 10:39:38 +0000 (12:39 +0200)
committerDmitry Vyukov <dvyukov@google.com>
Wed, 11 Aug 2021 11:03:16 +0000 (13:03 +0200)
Fix bug introduced by commit 5d106f16b972.
SANITIZER_IOSSIM is always defined,
it's the value 0/1 that's meaningful.

Reviewed By: DavidSpickett

Differential Revision: https://reviews.llvm.org/D107888

compiler-rt/lib/tsan/rtl/tsan_platform.h

index a944fdc..e36ef21 100644 (file)
@@ -648,8 +648,7 @@ ALWAYS_INLINE auto SelectMapping(Arg arg) {
   return Func::template Apply<MappingGo48>(arg);
 #  endif
 #else  // SANITIZER_GO
-#  if defined(__x86_64__) || defined(SANITIZER_IOSSIM) || \
-      SANITIZER_MAC && !SANITIZER_IOS
+#  if defined(__x86_64__) || SANITIZER_IOSSIM || SANITIZER_MAC && !SANITIZER_IOS
   return Func::template Apply<Mapping48AddressSpace>(arg);
 #  elif defined(__aarch64__) && defined(__APPLE__)
   return Func::template Apply<MappingAppleAarch64>(arg);