Backed out changeset 89ffaadaf58b (bug 1389561) for disabling assertion. r=backout a=backout
authorShawn Huang <shuang@mozilla.com>
Tue, 24 Oct 2017 19:38:11 +0800
changeset 387852 34b8dc4374dc3d707402d11ef3e2f9e82791f486
parent 387851 3792e9864edade3efd257a061a015a22a93dd8f4
child 387853 17c1e024efc2ac9dd1638c568d70c91548e986dc
push id32738
push userarchaeopteryx@coole-files.de
push dateTue, 24 Oct 2017 21:58:00 +0000
treeherdermozilla-central@a124f4901430 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1389561
milestone58.0a1
backs out89ffaadaf58b8afabb671cfcc7382aa743f78a51
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
Backed out changeset 89ffaadaf58b (bug 1389561) for disabling assertion. r=backout a=backout
dom/quota/ActorsParent.cpp
--- a/dom/quota/ActorsParent.cpp
+++ b/dom/quota/ActorsParent.cpp
@@ -533,17 +533,17 @@ public:
   }
 
 private:
   // Private destructor, to discourage deletion outside of Release():
   ~OriginInfo()
   {
     MOZ_COUNT_DTOR(OriginInfo);
 
-    MOZ_DIAGNOSTIC_ASSERT(!mQuotaObjects.Count());
+    MOZ_ASSERT(!mQuotaObjects.Count());
   }
 
   void
   LockedDecreaseUsage(int64_t aSize);
 
   void
   LockedUpdateAccessTime(int64_t aAccessTime)
   {
@@ -3131,20 +3131,19 @@ QuotaObject::LockedMaybeUpdateSize(int64
 
     NS_ASSERTION(mOriginInfo, "How come?!");
 
     for (DirectoryLockImpl* lock : locks) {
       MOZ_ASSERT(!lock->GetPersistenceType().IsNull());
       MOZ_ASSERT(!lock->GetGroup().IsEmpty());
       MOZ_ASSERT(lock->GetOriginScope().IsOrigin());
       MOZ_ASSERT(!lock->GetOriginScope().GetOrigin().IsEmpty());
-      MOZ_DIAGNOSTIC_ASSERT(
-             !(lock->GetOriginScope().GetOrigin() == mOriginInfo->mOrigin &&
-             lock->GetPersistenceType().Value() == groupInfo->mPersistenceType),
-             "Deleted itself!");
+      MOZ_ASSERT(!(lock->GetOriginScope().GetOrigin() == mOriginInfo->mOrigin &&
+                   lock->GetPersistenceType().Value() == groupInfo->mPersistenceType),
+                 "Deleted itself!");
 
       quotaManager->LockedRemoveQuotaForOrigin(
                                              lock->GetPersistenceType().Value(),
                                              lock->GetGroup(),
                                              lock->GetOriginScope().GetOrigin());
     }
 
     // We unlocked and relocked several times so we need to recompute all the
@@ -3477,18 +3476,18 @@ QuotaManager::CollectOriginsForEviction(
           DirectoryLockImpl* lock = aLocks[j - 1];
           if (originScope.Matches(lock->GetOriginScope())) {
             match = true;
             break;
           }
         }
 
         if (!match) {
-          MOZ_DIAGNOSTIC_ASSERT(!originInfo->mQuotaObjects.Count(),
-                                "Inactive origin shouldn't have open files!");
+          MOZ_ASSERT(!originInfo->mQuotaObjects.Count(),
+                     "Inactive origin shouldn't have open files!");
           aInactiveOriginInfos.InsertElementSorted(originInfo,
                                                    OriginInfoLRUComparator());
         }
       }
     }
   };
 
   // Split locks into separate arrays and filter out locks for persistent