From 35e1dbd18920a0f1863cd06651d217693a94ad60 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Thu, 24 Jun 2021 00:07:24 -0700 Subject: [PATCH] [scudo] Fix test on arch without MTE --- compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 461c864..747638b 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 NoTags; - if (scudo::systemSupportsMemoryTagging() && !SCUDO_ANDROID) + if (!SCUDO_ANDROID && scudo::archSupportsMemoryTagging() && scudo::systemSupportsMemoryTagging()) NoTags = std::make_unique(); Ready = false; -- 2.7.4