[compiler-rt] 9af6156 - tsan: fix active mapping selection

[Dmitry Vyukov via llvm-commits]

Author: Dmitry Vyukov
Date: 2021-08-11T13:03:16+02:00
New Revision: 9af6156c5236829b602d9c522708f2f4f8f79573

URL: https://github.com/llvm/llvm-project/commit/9af6156c5236829b602d9c522708f2f4f8f79573
DIFF: https://github.com/llvm/llvm-project/commit/9af6156c5236829b602d9c522708f2f4f8f79573.diff

LOG: tsan: fix active mapping selection

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

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/tsan/rtl/tsan_platform.h b/compiler-rt/lib/tsan/rtl/tsan_platform.h
index a944fdcb150a..e36ef21f7e12 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_platform.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_platform.h
@@ -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);