Bug 1529644: fix use of DIAGNOSTIC members outside ifdef in timers r=ehsan
authorRandell Jesup <rjesup@wgate.com>
Fri, 22 Feb 2019 17:22:50 -0500
changeset 518602 aea45260a0bcb1da32fe474c957c5b1751b636da
parent 518601 965d985aeda572d16800fa301ca9fee410cb2fe7
child 518603 75f417cfd0d21205c36493cfd1086faacd4a5182
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1529644
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1529644: fix use of DIAGNOSTIC members outside ifdef in timers r=ehsan
dom/base/TimeoutManager.cpp
--- a/dom/base/TimeoutManager.cpp
+++ b/dom/base/TimeoutManager.cpp
@@ -861,21 +861,28 @@ void TimeoutManager::RunTimeout(const Ti
       if (timeout->mFiringId != firingId) {
         // If the FiringId does not match, but is still valid, then this is
         // a Timeout for another RunTimeout() on the call stack (such as in
         // the case of nested event loops, for alert() or more likely XHR).
         // Just skip it.
         if (IsValidFiringId(timeout->mFiringId)) {
           MOZ_LOG(gTimeoutLog, LogLevel::Debug,
                   ("Skipping Run%s(TimeoutManager=%p, timeout=%p) since "
-                   "firingId %d is valid (processing firingId %d) - "
-                   "FiringIndex %" PRId64 " (mLastFiringIndex %" PRId64 ")",
+                   "firingId %d is valid (processing firingId %d)"
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
+                   " - FiringIndex %" PRId64 " (mLastFiringIndex %" PRId64 ")"
+#endif
+                   ,
                    timeout->mIsInterval ? "Interval" : "Timeout", this,
-                   timeout.get(), timeout->mFiringId, firingId,
-                   timeout->mFiringIndex, mFiringIndex));
+                   timeout.get(), timeout->mFiringId, firingId
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
+                   ,
+                   timeout->mFiringIndex, mFiringIndex
+#endif
+                   ));
 #ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
           // The old FiringIndex assumed no recursion; recursion can cause
           // other timers to get fired "in the middle" of a sequence we've
           // already assigned firingindexes to.  Since we're not going to
           // run this timeout now, remove any FiringIndex that was already
           // set.
 
           // Since all timers that have FiringIndexes set *must* be ready