Bug 1920718 - Annotate all global variable with runtime initializatio…

…n attributes r=glandium,application-update-reviewers,media-playback-reviewers,anti-tracking-reviewers,places-reviewers,profiler-reviewers,gfx-reviewers,aosmond,lina,nalexander,aabh,geckoview-reviewers,win-reviewers,gstoll,m_kato MOZ_RUNINIT => initialized at runtime MOZ_CONSTINIT => initialized at compile time MOZ_GLOBINIT => initialized either at runtime or compile time, depending on template parameter, macro parameter etc This annotation is only understood by our clang-tidy plugin. It has no effect on regular compilation. Differential Revision: https://phabricator.services.mozilla.com/D223341
mozilla · Oct 30, 2024 · 8a0a0f7 · 8a0a0f7
1 parent 793bb2c
commit 8a0a0f7
Show file tree

Hide file tree

Showing 290 changed files with 926 additions and 797 deletions.
diff --git a/accessible/android/Platform.cpp b/accessible/android/Platform.cpp
@@ -19,7 +19,7 @@
 using namespace mozilla;
 using namespace mozilla::a11y;
 
-static nsTHashMap<nsStringHashKey, nsString> sLocalizedStrings;
+MOZ_RUNINIT static nsTHashMap<nsStringHashKey, nsString> sLocalizedStrings;
 
 void a11y::PlatformInit() {
   nsresult rv = NS_OK;

diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp
@@ -1498,7 +1498,7 @@ LocalAccessible* nsAccessibilityService::CreateAccessible(
 #  include "mozilla/Monitor.h"
 #  include "mozilla/Maybe.h"
 
-static Maybe<Monitor> sAndroidMonitor;
+MOZ_RUNINIT static Maybe<Monitor> sAndroidMonitor;
 
 mozilla::Monitor& nsAccessibilityService::GetAndroidMonitor() {
   if (!sAndroidMonitor.isSome()) {

diff --git a/accessible/mac/MOXTextMarkerDelegate.mm b/accessible/mac/MOXTextMarkerDelegate.mm
@@ -18,8 +18,8 @@
 
 #define PREF_ACCESSIBILITY_MAC_DEBUG "accessibility.mac.debug"
 
-static nsTHashMap<nsPtrHashKey<mozilla::a11y::Accessible>,
-                  MOXTextMarkerDelegate*>
+MOZ_RUNINIT static nsTHashMap<nsPtrHashKey<mozilla::a11y::Accessible>,
+                              MOXTextMarkerDelegate*>
     sDelegates;
 
 @implementation MOXTextMarkerDelegate

diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm
@@ -411,7 +411,7 @@ - (NSString*)moxSubrole {
   const nsString description;
 };
 
-static const RoleDescrMap sRoleDescrMap[] = {
+MOZ_RUNINIT static const RoleDescrMap sRoleDescrMap[] = {
     {@"AXApplicationAlert", u"alert"_ns},
     {@"AXApplicationAlertDialog", u"alertDialog"_ns},
     {@"AXApplicationDialog", u"dialog"_ns},

diff --git a/accessible/windows/msaa/MsaaAccessible.cpp b/accessible/windows/msaa/MsaaAccessible.cpp
@@ -45,7 +45,7 @@ static const GUID IID_MsaaAccessible = {
     0x4afc,
     {0xa3, 0x2c, 0xd6, 0xb5, 0xc0, 0x10, 0x04, 0x6b}};
 
-MsaaIdGenerator MsaaAccessible::sIDGen;
+MOZ_RUNINIT MsaaIdGenerator MsaaAccessible::sIDGen;
 ITypeInfo* MsaaAccessible::gTypeInfo = nullptr;
 
 /* static */

diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
@@ -158,7 +158,7 @@ static bool IsArg(const char* arg, const char* s) {
   return false;
 }
 
-Bootstrap::UniquePtr gBootstrap;
+MOZ_RUNINIT Bootstrap::UniquePtr gBootstrap;
 
 static int do_main(int argc, char* argv[], char* envp[]) {
   // Allow firefox.exe to launch XULRunner apps via -app <application.ini>

diff --git a/browser/app/winlauncher/freestanding/SafeThreadLocal.h b/browser/app/winlauncher/freestanding/SafeThreadLocal.h
@@ -78,8 +78,7 @@ class SafeThreadLocal final {
 };
 
 template <typename T>
-MOZ_THREAD_LOCAL(T)
-SafeThreadLocal<T>::sThreadLocal;
+MOZ_GLOBINIT MOZ_THREAD_LOCAL(T) SafeThreadLocal<T>::sThreadLocal;
 
 template <typename T>
 T SafeThreadLocal<T>::sGlobal = nullptr;

diff --git a/browser/app/winlauncher/test/TestCrossProcessWin.cpp b/browser/app/winlauncher/test/TestCrossProcessWin.cpp
@@ -289,9 +289,9 @@ static DynamicBlockList ConvertStaticBlocklistToDynamic(
   return blockList;
 }
 
-const DynamicBlockList gFullList =
+MOZ_RUNINIT const DynamicBlockList gFullList =
     ConvertStaticBlocklistToDynamic(gWindowsDllBlocklist);
-const DynamicBlockList gShortList =
+MOZ_RUNINIT const DynamicBlockList gShortList =
     ConvertStaticBlocklistToDynamic(kDllBlocklistShort);
 
 static bool TestDependentModules() {

diff --git a/caps/tests/gtest/TestPrincipalAttributes.cpp b/caps/tests/gtest/TestPrincipalAttributes.cpp
@@ -29,7 +29,7 @@ TEST_P(PrincipalAttributesTest, PrincipalAttributesTest) {
   ASSERT_EQ(principal->GetIsIpAddress(), GetParam().expectIsIpAddress);
 }
 
-static const PrincipalAttributesParam kAttributes[] = {
+MOZ_RUNINIT static const PrincipalAttributesParam kAttributes[] = {
     {nsAutoCString("https://mozilla.com"), false},
     {nsAutoCString("https://127.0.0.1"), true},
     {nsAutoCString("https://[::1]"), true},

diff --git a/docs/code-quality/coding-style/coding_style_cpp.rst b/docs/code-quality/coding-style/coding_style_cpp.rst
@@ -394,6 +394,11 @@ C/C++ practices
 -  One-argument constructors, that are not copy or move constructors,
    should generally be marked explicit. Exceptions should be annotated
    with ``MOZ_IMPLICIT``.
+-  Global variables with runtimle initialization should be avoided. Flagging
+   them as ``constexpr`` or ``MOZ_CONSTINIT`` is a good way to make sure the
+   initialization happens at compile-time. If runtime initialization cannot be
+   avoided, use the attribute ``MOZ_RUNINIT`` to identify those and tell the
+   linter to ignore that variable.
 -  Use ``char32_t`` as the return type or argument type of a method that
    returns or takes as argument a single Unicode scalar value. (Don't
    use UTF-32 strings, though.)

diff --git a/docshell/shistory/nsSHistory.cpp b/docshell/shistory/nsSHistory.cpp
@@ -82,7 +82,7 @@ struct ListHelper {
   LinkedList<nsSHistory> mList;
 };
 
-static ListHelper gSHistoryList;
+MOZ_RUNINIT static ListHelper gSHistoryList;
 // Max viewers allowed total, across all SHistory objects - negative default
 // means we will calculate how many viewers to cache based on total memory
 int32_t nsSHistory::sHistoryMaxTotalViewers = -1;

diff --git a/dom/base/CCGCScheduler.cpp b/dom/base/CCGCScheduler.cpp
@@ -15,20 +15,25 @@
 /* Globally initialized constants
  */
 namespace mozilla {
-const TimeDuration kOneMinute = TimeDuration::FromSeconds(60.0f);
-const TimeDuration kCCDelay = TimeDuration::FromSeconds(6);
-const TimeDuration kCCSkippableDelay = TimeDuration::FromMilliseconds(250);
-const TimeDuration kTimeBetweenForgetSkippableCycles =
+MOZ_RUNINIT const TimeDuration kOneMinute = TimeDuration::FromSeconds(60.0f);
+MOZ_RUNINIT const TimeDuration kCCDelay = TimeDuration::FromSeconds(6);
+MOZ_RUNINIT const TimeDuration kCCSkippableDelay =
+    TimeDuration::FromMilliseconds(250);
+MOZ_RUNINIT const TimeDuration kTimeBetweenForgetSkippableCycles =
     TimeDuration::FromSeconds(2);
-const TimeDuration kForgetSkippableSliceDuration =
+MOZ_RUNINIT const TimeDuration kForgetSkippableSliceDuration =
     TimeDuration::FromMilliseconds(2);
-const TimeDuration kICCIntersliceDelay = TimeDuration::FromMilliseconds(250);
-const TimeDuration kICCSliceBudget = TimeDuration::FromMilliseconds(3);
-const TimeDuration kIdleICCSliceBudget = TimeDuration::FromMilliseconds(2);
-const TimeDuration kMaxICCDuration = TimeDuration::FromSeconds(2);
+MOZ_RUNINIT const TimeDuration kICCIntersliceDelay =
+    TimeDuration::FromMilliseconds(250);
+MOZ_RUNINIT const TimeDuration kICCSliceBudget =
+    TimeDuration::FromMilliseconds(3);
+MOZ_RUNINIT const TimeDuration kIdleICCSliceBudget =
+    TimeDuration::FromMilliseconds(2);
+MOZ_RUNINIT const TimeDuration kMaxICCDuration = TimeDuration::FromSeconds(2);
 
-const TimeDuration kCCForced = kOneMinute * 2;
-const TimeDuration kMaxCCLockedoutTime = TimeDuration::FromSeconds(30);
+MOZ_RUNINIT const TimeDuration kCCForced = kOneMinute * 2;
+MOZ_RUNINIT const TimeDuration kMaxCCLockedoutTime =
+    TimeDuration::FromSeconds(30);
 }  // namespace mozilla
 
 /*

diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
@@ -14785,7 +14785,7 @@ class PendingFullscreenChangeList {
 };
 
 /* static */
-LinkedList<FullscreenChange> PendingFullscreenChangeList::sList;
+MOZ_RUNINIT LinkedList<FullscreenChange> PendingFullscreenChangeList::sList;
 
 size_t Document::CountFullscreenElements() const {
   size_t count = 0;

diff --git a/dom/base/FuzzingFunctions.cpp b/dom/base/FuzzingFunctions.cpp
@@ -89,7 +89,7 @@ struct ModifierKey final {
         mLockable(aLockable) {}
 };
 
-static const ModifierKey kModifierKeys[] = {
+MOZ_RUNINIT static const ModifierKey kModifierKeys[] = {
     ModifierKey(MODIFIER_ALT, KEY_NAME_INDEX_Alt, false),
     ModifierKey(MODIFIER_ALTGRAPH, KEY_NAME_INDEX_AltGraph, false),
     ModifierKey(MODIFIER_CONTROL, KEY_NAME_INDEX_Control, false),

diff --git a/dom/base/PlacesObservers.cpp b/dom/base/PlacesObservers.cpp
@@ -54,9 +54,10 @@ struct ListenerCollection {
 };
 
 template <class T>
-StaticAutoPtr<FlaggedArray<T>> ListenerCollection<T>::gListeners;
+MOZ_GLOBINIT StaticAutoPtr<FlaggedArray<T>> ListenerCollection<T>::gListeners;
 template <class T>
-StaticAutoPtr<FlaggedArray<T>> ListenerCollection<T>::gListenersToRemove;
+MOZ_GLOBINIT StaticAutoPtr<FlaggedArray<T>>
+    ListenerCollection<T>::gListenersToRemove;
 
 using JSListeners = ListenerCollection<RefPtr<PlacesEventCallback>>;
 using WeakJSListeners = ListenerCollection<WeakPtr<PlacesWeakCallbackWrapper>>;
@@ -66,7 +67,8 @@ using WeakNativeListeners =
 // Even if NotifyListeners is called any timing, we mange the notifications with
 // adding to this queue, then sending in sequence. This avoids sending nested
 // notifications while previous ones are still being sent.
-static nsTArray<Sequence<OwningNonNull<PlacesEvent>>> gNotificationQueue;
+MOZ_RUNINIT static nsTArray<Sequence<OwningNonNull<PlacesEvent>>>
+    gNotificationQueue;
 
 uint32_t GetEventTypeFlag(PlacesEventType aEventType) {
   if (aEventType == PlacesEventType::None) {

diff --git a/dom/base/PointerLockManager.cpp b/dom/base/PointerLockManager.cpp
@@ -34,10 +34,10 @@ using mozilla::dom::Element;
 using mozilla::dom::WindowContext;
 
 // Reference to the pointer locked element.
-static nsWeakPtr sLockedElement;
+MOZ_RUNINIT static nsWeakPtr sLockedElement;
 
 // Reference to the document which requested pointer lock.
-static nsWeakPtr sLockedDoc;
+MOZ_RUNINIT static nsWeakPtr sLockedDoc;
 
 // Reference to the BrowserParent requested pointer lock.
 static BrowserParent* sLockedRemoteTarget = nullptr;

diff --git a/dom/base/ScrollingMetrics.cpp b/dom/base/ScrollingMetrics.cpp
@@ -13,7 +13,7 @@ namespace mozilla {
 static TimeStamp gScrollingStartTime;
 static TimeStamp gScrollingEndTime;
 static uint32_t gScrollDistanceCSSPixels = 0;
-static dom::InteractionData gScrollingInteraction = {};
+MOZ_RUNINIT static dom::InteractionData gScrollingInteraction = {};
 
 void ScrollingMetrics::OnScrollingInteractionEnded() {
   // We are only interested in content process scrolling

diff --git a/dom/base/fuzztest/FuzzStructuredClone.cpp b/dom/base/fuzztest/FuzzStructuredClone.cpp
@@ -22,7 +22,7 @@ using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::dom::ipc;
 
-JS::PersistentRooted<JSObject*> global;
+MOZ_RUNINIT JS::PersistentRooted<JSObject*> global;
 
 static int FuzzingInitDomSC(int* argc, char*** argv) {
   JSObject* simpleGlobal =

diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
@@ -219,7 +219,7 @@ already_AddRefed<nsIRunnable> NativeInputRunnable::Create(
 
 }  // unnamed namespace
 
-LinkedList<OldWindowSize> OldWindowSize::sList;
+MOZ_RUNINIT LinkedList<OldWindowSize> OldWindowSize::sList;
 
 NS_INTERFACE_MAP_BEGIN(nsDOMWindowUtils)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMWindowUtils)

diff --git a/dom/base/test/gtest/TestScheduler.cpp b/dom/base/test/gtest/TestScheduler.cpp
@@ -11,11 +11,12 @@
 
 using namespace mozilla;
 
-static TimeDuration kOneSecond = TimeDuration::FromSeconds(1);
-static TimeDuration kTenthSecond = TimeDuration::FromSeconds(0.1);
-static TimeDuration kFrameDuration = TimeDuration::FromSeconds(1.0 / 60.0);
+MOZ_RUNINIT static TimeDuration kOneSecond = TimeDuration::FromSeconds(1);
+MOZ_RUNINIT static TimeDuration kTenthSecond = TimeDuration::FromSeconds(0.1);
+MOZ_RUNINIT static TimeDuration kFrameDuration =
+    TimeDuration::FromSeconds(1.0 / 60.0);
 
-static mozilla::TimeStamp sNow = TimeStamp::Now();
+MOZ_RUNINIT static mozilla::TimeStamp sNow = TimeStamp::Now();
 
 static mozilla::TimeStamp AdvanceTime(TimeDuration aDuration) {
   sNow += aDuration;
@@ -328,10 +329,10 @@ static bool BasicScenario(CCGCScheduler& aScheduler, TestGC* aTestGC,
   return true;
 }
 
-static CCGCScheduler scheduler;
-static TestGC gc(scheduler);
-static TestIdleCC ccIdle(scheduler);
-static TestNonIdleCC ccNonIdle(scheduler);
+MOZ_RUNINIT static CCGCScheduler scheduler;
+MOZ_RUNINIT static TestGC gc(scheduler);
+MOZ_RUNINIT static TestIdleCC ccIdle(scheduler);
+MOZ_RUNINIT static TestNonIdleCC ccNonIdle(scheduler);
 
 TEST(TestScheduler, Idle)
 {

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
@@ -2618,7 +2618,7 @@ def switchToCondition(condition, specs):
         specType = "const " + specType
         arrays = fill(
             """
-            static ${specType} ${name}_specs[] = {
+            MOZ_GLOBINIT static ${specType} ${name}_specs[] = {
             ${specs}
             };
 

diff --git a/dom/bindings/DOMJSProxyHandler.cpp b/dom/bindings/DOMJSProxyHandler.cpp
@@ -71,7 +71,7 @@ struct SetDOMProxyInformation {
   }
 };
 
-SetDOMProxyInformation gSetDOMProxyInformation;
+MOZ_RUNINIT SetDOMProxyInformation gSetDOMProxyInformation;
 
 static inline void CheckExpandoObject(JSObject* proxy,
                                       const JS::Value& expando) {

diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
@@ -102,7 +102,7 @@ WebGLContextOptions::WebGLContextOptions() {
 }
 
 StaticMutex WebGLContext::sLruMutex;
-std::list<WebGLContext*> WebGLContext::sLru;
+MOZ_RUNINIT std::list<WebGLContext*> WebGLContext::sLru;
 
 WebGLContext::LruPosition::LruPosition() {
   StaticMutexAutoLock lock(sLruMutex);

diff --git a/dom/canvas/WebGLFormats.cpp b/dom/canvas/WebGLFormats.cpp
@@ -85,8 +85,9 @@ static inline auto FindPtrOrNull(C& container, const K2& key) {
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-std::map<EffectiveFormat, const CompressedFormatInfo> gCompressedFormatInfoMap;
-std::map<EffectiveFormat, FormatInfo> gFormatInfoMap;
+MOZ_RUNINIT std::map<EffectiveFormat, const CompressedFormatInfo>
+    gCompressedFormatInfoMap;
+MOZ_RUNINIT std::map<EffectiveFormat, FormatInfo> gFormatInfoMap;
 
 static inline const CompressedFormatInfo* GetCompressedFormatInfo(
     EffectiveFormat format) {

diff --git a/dom/canvas/WebGLTexture.cpp b/dom/canvas/WebGLTexture.cpp
@@ -25,7 +25,7 @@
 namespace mozilla {
 namespace webgl {
 
-/*static*/ const ImageInfo ImageInfo::kUndefined;
+MOZ_RUNINIT /*static*/ const ImageInfo ImageInfo::kUndefined;
 
 size_t ImageInfo::MemoryUsage() const {
   if (!IsDefined()) return 0;

diff --git a/dom/crypto/WebCryptoTask.cpp b/dom/crypto/WebCryptoTask.cpp
@@ -26,7 +26,7 @@
 // Template taken from security/nss/lib/util/templates.c
 // This (or SGN_EncodeDigestInfo) would ideally be exported
 // by NSS and until that happens we have to keep our own copy.
-const SEC_ASN1Template SGN_DigestInfoTemplate[] = {
+MOZ_GLOBINIT const SEC_ASN1Template SGN_DigestInfoTemplate[] = {
     {SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SGNDigestInfo)},
     {SEC_ASN1_INLINE, offsetof(SGNDigestInfo, digestAlgorithm),
      SEC_ASN1_GET(SECOID_AlgorithmIDTemplate)},

diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
@@ -142,12 +142,12 @@ static nsITimer* gUserInteractionTimer = nullptr;
 static nsITimerCallback* gUserInteractionTimerCallback = nullptr;
 
 static const double kCursorLoadingTimeout = 1000;  // ms
-static AutoWeakFrame gLastCursorSourceFrame;
+MOZ_RUNINIT static AutoWeakFrame gLastCursorSourceFrame;
 static TimeStamp gLastCursorUpdateTime;
 static TimeStamp gTypingStartTime;
 static TimeStamp gTypingEndTime;
 static int32_t gTypingInteractionKeyPresses = 0;
-static dom::InteractionData gTypingInteraction = {};
+MOZ_RUNINIT static dom::InteractionData gTypingInteraction = {};
 
 static inline int32_t RoundDown(double aDouble) {
   return (aDouble > 0) ? static_cast<int32_t>(floor(aDouble))
@@ -559,14 +559,14 @@ bool EventStateManager::sNormalLMouseEventInProcess = false;
 int16_t EventStateManager::sCurrentMouseBtn = MouseButton::eNotPressed;
 EventStateManager* EventStateManager::sActiveESM = nullptr;
 EventStateManager* EventStateManager::sCursorSettingManager = nullptr;
-AutoWeakFrame EventStateManager::sLastDragOverFrame = nullptr;
+MOZ_RUNINIT AutoWeakFrame EventStateManager::sLastDragOverFrame = nullptr;
 LayoutDeviceIntPoint EventStateManager::sPreLockScreenPoint =
     LayoutDeviceIntPoint(0, 0);
 LayoutDeviceIntPoint EventStateManager::sLastRefPoint = kInvalidRefPoint;
 CSSIntPoint EventStateManager::sLastScreenPoint = CSSIntPoint(0, 0);
 LayoutDeviceIntPoint EventStateManager::sSynthCenteringPoint = kInvalidRefPoint;
 CSSIntPoint EventStateManager::sLastClientPoint = CSSIntPoint(0, 0);
-nsCOMPtr<nsIContent> EventStateManager::sDragOverContent = nullptr;
+MOZ_RUNINIT nsCOMPtr<nsIContent> EventStateManager::sDragOverContent = nullptr;
 
 EventStateManager::WheelPrefs* EventStateManager::WheelPrefs::sInstance =
     nullptr;

diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp
@@ -79,12 +79,12 @@ nsIWidget* IMEStateManager::sActiveInputContextWidget = nullptr;
 StaticRefPtr<IMEContentObserver> IMEStateManager::sActiveIMEContentObserver;
 TextCompositionArray* IMEStateManager::sTextCompositions = nullptr;
 InputContext::Origin IMEStateManager::sOrigin = InputContext::ORIGIN_MAIN;
-InputContext IMEStateManager::sActiveChildInputContext;
+MOZ_RUNINIT InputContext IMEStateManager::sActiveChildInputContext;
 bool IMEStateManager::sInstalledMenuKeyboardListener = false;
 bool IMEStateManager::sIsGettingNewIMEState = false;
 bool IMEStateManager::sCleaningUpForStoppingIMEStateManagement = false;
 bool IMEStateManager::sIsActive = false;
-Maybe<IMEStateManager::PendingFocusedBrowserSwitchingData>
+MOZ_RUNINIT Maybe<IMEStateManager::PendingFocusedBrowserSwitchingData>
     IMEStateManager::sPendingFocusedBrowserSwitchingData;
 
 class PseudoFocusChangeRunnable : public Runnable {

diff --git a/dom/fetch/FetchParent.cpp b/dom/fetch/FetchParent.cpp
@@ -49,7 +49,8 @@ NS_IMETHODIMP FetchParent::FetchParentCSPEventListener::OnCSPViolationEvent(
   return NS_OK;
 }
 
-nsTHashMap<nsIDHashKey, RefPtr<FetchParent>> FetchParent::sActorTable;
+MOZ_RUNINIT nsTHashMap<nsIDHashKey, RefPtr<FetchParent>>
+    FetchParent::sActorTable;
 
 /*static*/
 RefPtr<FetchParent> FetchParent::GetActorByID(const nsID& aID) {

diff --git a/dom/fetch/FetchUtil.cpp b/dom/fetch/FetchUtil.cpp
@@ -655,7 +655,7 @@ class JSStreamConsumer final : public nsIInputStreamCallback,
 NS_IMPL_ISUPPORTS(JSStreamConsumer, nsIInputStreamCallback)
 
 // static
-const nsCString FetchUtil::WasmAltDataType;
+MOZ_RUNINIT const nsCString FetchUtil::WasmAltDataType;
 
 // static
 void FetchUtil::InitWasmAltDataType() {

diff --git a/dom/fs/test/gtest/parent/TestFileSystemOriginInitialization.cpp b/dom/fs/test/gtest/parent/TestFileSystemOriginInitialization.cpp
@@ -111,7 +111,7 @@ class TestFileSystemOriginInitialization : public FileSystemParentTest {
     FileSystemQuotaClientFactory::SetCustomFactory(nullptr);
   }
 
-  static inline RefPtr<MockFileSystemQuotaClient> sQuotaClient;
+  MOZ_RUNINIT static inline RefPtr<MockFileSystemQuotaClient> sQuotaClient;
 };
 
 TEST_F(TestFileSystemOriginInitialization, EmptyOriginDirectory) {

diff --git a/dom/gamepad/windows/WindowsGamepad.cpp b/dom/gamepad/windows/WindowsGamepad.cpp
@@ -100,7 +100,7 @@ class WindowsGamepadService;
 // it will be created and destroyed by background thread and
 // used by gMonitorThread
 WindowsGamepadService* MOZ_NON_OWNING_REF gService = nullptr;
-nsCOMPtr<nsIThread> gMonitorThread = nullptr;
+MOZ_RUNINIT nsCOMPtr<nsIThread> gMonitorThread = nullptr;
 static bool sIsShutdown = false;
 
 class Gamepad {