[compiler-rt] 6fd963a - [scudo] Avoid ifdef in test

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-06-23T23:58:09-07:00
New Revision: 6fd963ab64e7f0771bd59056b71ce915bc03d951

URL: https://github.com/llvm/llvm-project/commit/6fd963ab64e7f0771bd59056b71ce915bc03d951
DIFF: https://github.com/llvm/llvm-project/commit/6fd963ab64e7f0771bd59056b71ce915bc03d951.diff

LOG: [scudo] Avoid ifdef in test

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp b/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
index 24fbf277e032..461c8649eb52 100644
--- a/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
@@ -109,13 +109,12 @@ static void stressNew() {
 }
 
 TEST(ScudoWrappersCppTest, ThreadedNew) {
-#if !SCUDO_ANDROID
   // TODO: Investigate why libc sometimes crashes with tag missmatch in
   // __pthread_clockjoin_ex.
   std::unique_ptr<scudo::ScopedDisableMemoryTagChecks> NoTags;
-  if (scudo::systemSupportsMemoryTagging())
+  if (scudo::systemSupportsMemoryTagging() && !SCUDO_ANDROID)
     NoTags = std::make_unique<scudo::ScopedDisableMemoryTagChecks>();
-#endif
+
   Ready = false;
   std::thread Threads[32];
   for (size_t I = 0U; I < sizeof(Threads) / sizeof(Threads[0]); I++)