tor-browser

commit dbeb0cf657be6d6ce0391cf691bb07782845c5ad
parent 833580956df0e3d29116f9b64e29867aff9ec550
Author: Jens Stutte <jstutte@mozilla.com>
Date:   Wed, 19 Nov 2025 10:58:31 +0000

Bug 2000185 - Remove suppression for Windows of an assertion in ComputeWakeupTimeFromTimers. r=xpcom-reviewers,emilio

Bug 1995254 fixed the underlying problem that made this assertion trip occasionally in CI.

Together we can remove an already unused DEBUG only function in TimeStamp that was added in bug 1829983 when investigating an intermittent faliure on Windows with this assertion.

Differential Revision: https://phabricator.services.mozilla.com/D272995

Diffstat:
M
mozglue/misc/TimeStamp.h
 | 
4
----
M
xpcom/threads/TimerThread.cpp
 | 
4
----

2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h
@@ -151,10 +151,6 @@ class BaseTimeDuration {
     return FromTicks(std::min(aA.mValue, aB.mValue));
   }
 
-#if defined(DEBUG)
-  int64_t GetValue() const { return mValue; }
-#endif
-
  private:
   // Block double multiplier (slower, imprecise if long duration) - Bug 853398.
   // If required, use MultDouble explicitly and with care.
diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp
@@ -720,13 +720,9 @@ TimeStamp TimerThread::ComputeWakeupTimeFromTimers() const {
     MOZ_ASSERT(bundleWakeup <= cutoffTime);
   }
 
-#if !defined(XP_WIN)
-  // Due to the fact that, on Windows, each TimeStamp object holds two distinct
-  // "values", this assert is not valid there. See bug 1829983 for the details.
   MOZ_ASSERT(bundleWakeup - mTimers[0].mTimeout <=
              ComputeAcceptableFiringDelay(mTimers[0].mDelay, minTimerDelay,
                                           maxTimerDelay));
-#endif
 
   return bundleWakeup;
 }