[compiler-rt] 35e1dbd - [scudo] Fix test on arch without MTE

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-06-24T00:07:24-07:00
New Revision: 35e1dbd18920a0f1863cd06651d217693a94ad60

URL: https://github.com/llvm/llvm-project/commit/35e1dbd18920a0f1863cd06651d217693a94ad60
DIFF: https://github.com/llvm/llvm-project/commit/35e1dbd18920a0f1863cd06651d217693a94ad60.diff

LOG: [scudo] Fix test on arch without MTE

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 461c8649eb52..747638b24860 100644
--- a/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
@@ -112,7 +112,7 @@ TEST(ScudoWrappersCppTest, ThreadedNew) {
   // TODO: Investigate why libc sometimes crashes with tag missmatch in
   // __pthread_clockjoin_ex.
   std::unique_ptr<scudo::ScopedDisableMemoryTagChecks> NoTags;
-  if (scudo::systemSupportsMemoryTagging() && !SCUDO_ANDROID)
+  if (!SCUDO_ANDROID && scudo::archSupportsMemoryTagging() && scudo::systemSupportsMemoryTagging())
     NoTags = std::make_unique<scudo::ScopedDisableMemoryTagChecks>();
 
   Ready = false;