[compiler-rt] 07a1f35 - [scudo] Fix test on aarch64 without MTE

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-07-01T21:40:04-07:00
New Revision: 07a1f3513e2e3802671a0a4ca1edf2fe577fad03

URL: https://github.com/llvm/llvm-project/commit/07a1f3513e2e3802671a0a4ca1edf2fe577fad03
DIFF: https://github.com/llvm/llvm-project/commit/07a1f3513e2e3802671a0a4ca1edf2fe577fad03.diff

LOG: [scudo] Fix test on aarch64 without MTE

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/tests/secondary_test.cpp b/compiler-rt/lib/scudo/standalone/tests/secondary_test.cpp
index d3b7c486f7c3..723679228cba 100644
--- a/compiler-rt/lib/scudo/standalone/tests/secondary_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/secondary_test.cpp
@@ -21,7 +21,8 @@
 #include <vector>
 
 template <typename Config> static scudo::Options getOptionsForConfig() {
-  if (!Config::MaySupportMemoryTagging || !scudo::archSupportsMemoryTagging())
+  if (!Config::MaySupportMemoryTagging || !scudo::archSupportsMemoryTagging() ||
+      !scudo::systemSupportsMemoryTagging())
     return {};
   scudo::AtomicOptions AO;
   AO.set(scudo::OptionBit::UseMemoryTagging);