From: Vitaly Buka <vitalybuka@google.com>
Date: Fri, 2 Jul 2021 04:40:04 +0000 (-0700)
Subject: [scudo] Fix test on aarch64 without MTE
X-Git-Tag: llvmorg-14-init~2407
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07a1f3513e2e3802671a0a4ca1edf2fe577fad03;p=platform%2Fupstream%2Fllvm.git

[scudo] Fix test on aarch64 without MTE
---

diff --git a/compiler-rt/lib/scudo/standalone/tests/secondary_test.cpp b/compiler-rt/lib/scudo/standalone/tests/secondary_test.cpp
index d3b7c48..72367922 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);