Bug 1400153 - Rename nextInPhase -> nextWithPhaseKind, r=jonco
authorSteve Fink <sfink@mozilla.com>
Fri, 20 Apr 2018 11:34:00 -0700
changeset 415110 7ce50d118d22a3a27be3b5761d05c7bb5d3d8c1a
parent 415109 4ca67a1ab5b2e8a191caeb19ec09b07b7c42849e
child 415111 5bfd3b3d6cc2c45e0682342071d0f635aca86741
push id102504
push usersfink@mozilla.com
push dateMon, 23 Apr 2018 23:41:55 +0000
treeherdermozilla-inbound@5bfd3b3d6cc2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjonco
bugs1400153
milestone61.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 1400153 - Rename nextInPhase -> nextWithPhaseKind, r=jonco
js/src/gc/Statistics.cpp
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -105,17 +105,17 @@ struct PhaseKindInfo
 };
 
 // PhaseInfo objects form a tree.
 struct PhaseInfo
 {
     Phase parent;
     Phase firstChild;
     Phase nextSibling;
-    Phase nextInPhase;
+    Phase nextWithPhaseKind;
     PhaseKind phaseKind;
     uint8_t depth;
     const char* name;
     const char* path;
 };
 
 // A table of PhaseInfo indexed by Phase.
 using PhaseTable = EnumeratedArray<Phase, Phase::LIMIT, PhaseInfo>;
@@ -161,17 +161,17 @@ Statistics::lookupChildPhase(PhaseKind p
 
     MOZ_ASSERT(phaseKind < PhaseKind::LIMIT);
 
     // Search all expanded phases that correspond to the required
     // phase to find the one whose parent is the current expanded phase.
     Phase phase;
     for (phase = phaseKinds[phaseKind].firstPhase;
          phase != Phase::NONE;
-         phase = phases[phase].nextInPhase)
+         phase = phases[phase].nextWithPhaseKind)
     {
         if (phases[phase].parent == currentPhase())
             break;
     }
 
     MOZ_RELEASE_ASSERT(phase != Phase::NONE,
                        "Requested child phase not found under current phase");
 
@@ -764,20 +764,20 @@ Statistics::initialize()
             MOZ_ASSERT(i == phases[firstChild].parent);
             MOZ_ASSERT(phases[i].depth == phases[firstChild].depth - 1);
         }
         auto nextSibling = phases[i].nextSibling;
         if (nextSibling != Phase::NONE) {
             MOZ_ASSERT(parent == phases[nextSibling].parent);
             MOZ_ASSERT(phases[i].depth == phases[nextSibling].depth);
         }
-        auto nextInPhase = phases[i].nextInPhase;
-        if (nextInPhase != Phase::NONE) {
-            MOZ_ASSERT(phases[i].phaseKind == phases[nextInPhase].phaseKind);
-            MOZ_ASSERT(parent != phases[nextInPhase].parent);
+        auto nextWithPhaseKind = phases[i].nextWithPhaseKind;
+        if (nextWithPhaseKind != Phase::NONE) {
+            MOZ_ASSERT(phases[i].phaseKind == phases[nextWithPhaseKind].phaseKind);
+            MOZ_ASSERT(parent != phases[nextWithPhaseKind].parent);
         }
     }
     for (auto i : AllPhaseKinds()) {
         MOZ_ASSERT(phases[phaseKinds[i].firstPhase].phaseKind == i);
         for (auto j : AllPhaseKinds()) {
             MOZ_ASSERT_IF(i != j,
                           phaseKinds[i].telemetryBucket != phaseKinds[j].telemetryBucket);
         }
@@ -820,17 +820,17 @@ Statistics::getMaxGCPauseSinceClear()
 // Sum up the time for a phase, including instances of the phase with different
 // parents.
 static TimeDuration
 SumPhase(PhaseKind phaseKind, const Statistics::PhaseTimeTable& times)
 {
     TimeDuration sum = 0;
     for (Phase phase = phaseKinds[phaseKind].firstPhase;
          phase != Phase::NONE;
-         phase = phases[phase].nextInPhase)
+         phase = phases[phase].nextWithPhaseKind)
     {
         sum += times[phase];
     }
     return sum;
 }
 
 static bool
 CheckSelfTime(Phase parent,