From bd16c670611e06ceed395610e669978188c905cd Mon Sep 17 00:00:00 2001
From: Bas Schouten <bschouten@mozilla.com>
Date: Thu, 15 May 2025 21:02:38 +0000
Subject: [PATCH] Bug 1963506: Mark PerfStats::sCollectionMask as a relaxed
 ordering atomic. r=mstange

Differential Revision: https://phabricator.services.mozilla.com/D249668
---
 tools/performance/PerfStats.cpp | 3 ++-
 tools/performance/PerfStats.h   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/performance/PerfStats.cpp b/tools/performance/PerfStats.cpp
index d15977ddbf5b..77165759af66 100644
--- a/tools/performance/PerfStats.cpp
+++ b/tools/performance/PerfStats.cpp
@@ -26,7 +26,8 @@ static const char* const sMetricNames[] = {
 #undef METRIC_NAME
         "Invalid"};
 
-PerfStats::MetricMask PerfStats::sCollectionMask = 0;
+Atomic<PerfStats::MetricMask, MemoryOrdering::Relaxed>
+    PerfStats::sCollectionMask{0};
 StaticMutex PerfStats::sMutex;
 StaticAutoPtr<PerfStats> PerfStats::sSingleton;
 
diff --git a/tools/performance/PerfStats.h b/tools/performance/PerfStats.h
index bcea8b38d04a..af4e591c8360 100644
--- a/tools/performance/PerfStats.h
+++ b/tools/performance/PerfStats.h
@@ -7,6 +7,7 @@
 #ifndef PerfStats_h
 #define PerfStats_h
 
+#include "mozilla/Atomics.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
@@ -168,7 +169,7 @@ class PerfStats {
   RefPtr<PerfStatsPromise> CollectPerfStatsJSONInternal();
   nsCString CollectLocalPerfStatsJSONInternal();
 
-  static MetricMask sCollectionMask;
+  static Atomic<MetricMask, MemoryOrdering::Relaxed> sCollectionMask;
   static StaticMutex sMutex MOZ_UNANNOTATED;
   static StaticAutoPtr<PerfStats> sSingleton;
   TimeStamp mRecordedStarts[static_cast<uint64_t>(Metric::Max)];