Bug 1182516 - Fix mid-air conflict with 3fd2ab6cb762 on a CLOSED TREE. r=bustage
authorBenoit Girard <b56girard@gmail.com>
Wed, 15 Jul 2015 18:08:25 -0400
changeset 253113 f54e7f247cf2586f5e51b04f133f87f4eafc7816
parent 253112 fe2800b80350314ab5cdab826f69f2837a4c3fd6
child 253114 fcc104327dce879f9f7c7b193c528cf3795bcb14
push id29061
push userryanvm@gmail.com
push dateThu, 16 Jul 2015 18:53:45 +0000
treeherdermozilla-central@a0f4a688433d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1182516
milestone42.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 1182516 - Fix mid-air conflict with 3fd2ab6cb762 on a CLOSED TREE. r=bustage
xpcom/glue/pldhash.cpp
--- a/xpcom/glue/pldhash.cpp
+++ b/xpcom/glue/pldhash.cpp
@@ -817,17 +817,17 @@ PLDHashTable::Iterator::Iterator(PLDHash
   , mNexts(0)
   , mNextsLimit(mTable->EntryCount())
   , mHaveRemoved(false)
 {
 #ifdef DEBUG
   mTable->mChecker.StartReadOp();
 #endif
 
-  if (ChaosMode::isActive(ChaosMode::HashTableIteration) &&
+  if (ChaosMode::isActive(ChaosFeature::HashTableIteration) &&
       mTable->Capacity() > 0) {
     // Start iterating at a random entry. It would be even more chaotic to
     // iterate in fully random order, but that's harder.
     mCurrent += ChaosMode::randomUint32LessThan(mTable->Capacity()) *
                 mTable->mEntrySize;
   }
 
   // Advance to the first live entry, if there is one.