commit 7bd3d8e141c97a1479a037942321f4f442f11866
author Vitaly Buka <vitalybuka@google.com> Wed Jun 23 23:52:47 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jun 29 14:40:26 2021 -0700
tree eb6c895cdcbf56a63b35139554ea302410336167
parent 46439473092074b2b94316acf17e002adcf2f7e3

[scudo] Fix use of ScopedDisableMemoryTagChecks in test

GitOrigin-RevId: 99ec78c0feded25a2b01dd5ae822b37a70b63c17

tests/wrappers_cpp_test.cpp

diff --git a/tests/wrappers_cpp_test.cpp b/tests/wrappers_cpp_test.cpp
index 64a0917..24fbf27 100644
--- a/tests/wrappers_cpp_test.cpp
+++ b/tests/wrappers_cpp_test.cpp
@@ -11,6 +11,7 @@
 
 #include <atomic>
 #include <condition_variable>
+#include <memory>
 #include <mutex>
 #include <thread>
 #include <vector>
@@ -111,7 +112,9 @@
 #if !SCUDO_ANDROID
   // TODO: Investigate why libc sometimes crashes with tag missmatch in
   // __pthread_clockjoin_ex.
-  scudo::ScopedDisableMemoryTagChecks NoTags;
+  std::unique_ptr<scudo::ScopedDisableMemoryTagChecks> NoTags;
+  if (scudo::systemSupportsMemoryTagging())
+    NoTags = std::make_unique<scudo::ScopedDisableMemoryTagChecks>();
 #endif
   Ready = false;
   std::thread Threads[32];