Backed out changeset d6180c846c36 for bustage on a CLOSED TREE
authorTerrence Cole <terrence@mozilla.com>
Fri, 18 Oct 2013 12:30:12 -0700
changeset 166150 3b459fed3fc63cad9ecce02a93e5697aad0a7739
parent 166149 d6180c846c364e87fba89072302fa6069757756c
child 166151 5861a2de43d355d16b1581466d689667ff29027e
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone27.0a1
backs outd6180c846c364e87fba89072302fa6069757756c
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 d6180c846c36 for bustage on a CLOSED TREE
js/src/jsgc.cpp
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -4071,20 +4071,19 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocat
     FinishMarkingValidation(rt);
 
     rt->gcLastGCTime = PRMJ_Now();
 }
 
 namespace {
 
 /* ...while this class is to be used only for garbage collection. */
-class AutoGCSession
+class AutoGCSession : AutoTraceSession
 {
     AutoPauseWorkersForTracing pause;
-    AutoTraceSession session;
 
   public:
     explicit AutoGCSession(JSRuntime *rt);
     ~AutoGCSession();
 };
 
 } /* anonymous namespace */
 
@@ -4101,18 +4100,18 @@ AutoTraceSession::AutoTraceSession(JSRun
 
 AutoTraceSession::~AutoTraceSession()
 {
     JS_ASSERT(runtime->isHeapBusy());
     runtime->heapState = prevState;
 }
 
 AutoGCSession::AutoGCSession(JSRuntime *rt)
-  : pause(rt),
-    session(rt, MajorCollecting)
+  : AutoTraceSession(rt, MajorCollecting),
+    pause(rt)
 {
     runtime->gcIsNeeded = false;
     runtime->gcInterFrameGC = true;
 
     runtime->gcNumber++;
 
 #ifdef DEBUG
     // Threads with an exclusive context should never pause while they are in