Merge m-c to autoland, a=merge
authorWes Kocher <wkocher@mozilla.com>
Mon, 22 Aug 2016 09:45:35 -0700
changeset 336357 d15eeb67d8bff77fdbce4714f9a04f8dec63e576
parent 336356 ca0db8a96531c273e644a3bf200c2f34554af094 (current diff)
parent 336320 63988dbb25327ff93dd6e0c7e07b2b819795a9eb (diff)
child 336358 ecd29e0a263208d596a88e2fafa88d30ca558ca3
push id10033
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:50:26 +0000
treeherdermozilla-aurora@5dddbefdf759 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone51.0a1
Merge m-c to autoland, a=merge
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -1306,17 +1306,17 @@ Statistics::printSliceProfile()
 
     static int printedHeader = 0;
     if ((printedHeader++ % 200) == 0) {
         fprintf(stderr, "MajorGC:               Reason States      ");
         printProfileHeader();
     }
 
     fprintf(stderr, "MajorGC: %20s %1d -> %1d      ",
-            ExplainReason(slice.reason), slice.initialState, slice.finalState);
+            ExplainReason(slice.reason), int(slice.initialState), int(slice.finalState));
 
     ProfileTimes times;
     times[ProfileKey::Total] = slice.duration();
     totalTimes_[ProfileKey::Total] += times[ProfileKey::Total];
 
 #define GET_PROFILE_TIME(name, text, phase)                                   \
     times[ProfileKey::name] = slice.phaseTimes[PHASE_DAG_NONE][phase];                     \
     totalTimes_[ProfileKey::name] += times[ProfileKey::name];