Always mprotect the secondary

pcc · pcc · commit 307c1c4e18be · 2021-04-29T14:41:11.000-07:00
diff --git a/compiler-rt/lib/scudo/standalone/secondary.h b/compiler-rt/lib/scudo/standalone/secondary.h
@@ -141,7 +141,7 @@ template <typename Config> class MapAllocatorCache {
     Entry.BlockBegin = reinterpret_cast<uptr>(H + 1);
     Entry.Data = H->Data;
     Entry.Time = Time;
-    if (useMemoryTagging<Config>(Options)) {
+    if (1) {
       if (Interval == 0 && !SCUDO_FUCHSIA) {
         // Release the memory and make it inaccessible at the same time by
         // creating a new MAP_NOACCESS mapping on top of the existing mapping.
@@ -243,7 +243,7 @@ template <typename Config> class MapAllocatorCache {
       *H = reinterpret_cast<LargeBlock::Header *>(
           LargeBlock::addHeaderTag<Config>(HeaderPos));
       *Zeroed = Entry.Time == 0;
-      if (useMemoryTagging<Config>(Options))
+      if (1)
         setMemoryPermission(Entry.CommitBase, Entry.CommitSize, 0, &Entry.Data);
       uptr NewBlockBegin = reinterpret_cast<uptr>(*H + 1);
       if (useMemoryTagging<Config>(Options)) {
