Bug 950456 - Fix tracing for baseline type monitor and update stubs, r=jandem.
authorBrian Hackett <bhackett1024@gmail.com>
Mon, 16 Dec 2013 14:04:49 -0800
changeset 160712 5c3e2e933e483306fe8b1c39798b80ecf4b33285
parent 160711 93eccb617652b06e18714204a7b38f3d8ac6b7ea
child 160713 b7a7928b9e5c33fca8fd4b72a49cf3c0be746f54
push id37672
push userbhackett@mozilla.com
push dateMon, 16 Dec 2013 22:04:46 +0000
treeherdermozilla-inbound@5c3e2e933e48 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs950456
milestone29.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 950456 - Fix tracing for baseline type monitor and update stubs, r=jandem.
js/src/jit/BaselineIC.cpp
--- a/js/src/jit/BaselineIC.cpp
+++ b/js/src/jit/BaselineIC.cpp
@@ -171,24 +171,24 @@ ICStub::trace(JSTracer *trc)
     // If the stub is a monitored fallback stub, then mark the monitor ICs hanging
     // off of that stub.  We don't need to worry about the regular monitored stubs,
     // because the regular monitored stubs will always have a monitored fallback stub
     // that references the same stub chain.
     if (isMonitoredFallback()) {
         ICTypeMonitor_Fallback *lastMonStub = toMonitoredFallbackStub()->fallbackMonitorStub();
         for (ICStubConstIterator iter = lastMonStub->firstMonitorStub(); !iter.atEnd(); iter++) {
             JS_ASSERT_IF(iter->next() == nullptr, *iter == lastMonStub);
-            iter->markCode(trc, "baseline-monitor-stub-ioncode");
+            iter->trace(trc);
         }
     }
 
     if (isUpdated()) {
         for (ICStubConstIterator iter = toUpdatedStub()->firstUpdateStub(); !iter.atEnd(); iter++) {
             JS_ASSERT_IF(iter->next() == nullptr, iter->isTypeUpdate_Fallback());
-            iter->markCode(trc, "baseline-update-stub-ioncode");
+            iter->trace(trc);
         }
     }
 
     switch (kind()) {
       case ICStub::Call_Scripted: {
         ICCall_Scripted *callStub = toCall_Scripted();
         MarkScript(trc, &callStub->calleeScript(), "baseline-callscripted-callee");
         if (callStub->templateObject())