Backed out changeset 1d91ad1c6c6e (bug 1704391) for multiple failures in xpcom/threads/nsTimerImpl.cpp. CLOSED TREE

xpcom/build/XPCOMInit.cpp

@@ -150,8 +150,6 @@ nsComponentManagerImpl* nsComponentManagerImpl::gComponentManager = nullptr;
 bool gXPCOMShuttingDown = false;
 mozilla::Atomic<bool, mozilla::SequentiallyConsistent> gXPCOMThreadsShutDown(
     false);
-mozilla::Atomic<bool, mozilla::SequentiallyConsistent> gXPCOMTimersShutDown(
-    false);
 bool gXPCOMMainThreadEventsAreDoomed = false;
 char16_t* gGREBinPath = nullptr;
 
@@ -630,7 +628,6 @@ nsresult ShutdownXPCOM(nsIServiceManager* aServMgr) {
     // Shutdown the timer thread and all timers that might still be alive before
     // shutting down the component manager
     nsTimerImpl::Shutdown();
-    gXPCOMTimersShutDown = true;
 
     NS_ProcessPendingEvents(thread);
 

xpcom/build/nsXPCOM.h

@@ -34,8 +34,6 @@ DECL_CLASS(nsIDebug2);
 extern bool gXPCOMShuttingDown;
 extern mozilla::Atomic<bool, mozilla::SequentiallyConsistent>
     gXPCOMThreadsShutDown;
-extern mozilla::Atomic<bool, mozilla::SequentiallyConsistent>
-    gXPCOMTimersShutDown;
 extern bool gXPCOMMainThreadEventsAreDoomed;
 #endif
 

xpcom/threads/nsTimerImpl.cpp

@@ -394,13 +394,6 @@ nsresult nsTimerImpl::Cancel() {
 }
 
 void nsTimerImpl::CancelImpl(bool aClearITimer) {
-  if (gXPCOMTimersShutDown) {
-    // Some timers are created during XPCOM shutdown. But if we have already
-    // undergone timer thread shutdown, we will not have a timer to cancel here.
-    MOZ_ASSERT_UNREACHABLE(
-        "Tried to cancel a timer after timers have been freed.");
-    return;
-  }
   Callback cbTrash;
   RefPtr<nsITimer> timerTrash;