Merge.
authorAndreas Gal <gal@mozilla.com>
Thu, 29 Jan 2009 22:04:21 -0800
changeset 24494 f0e215b8c63048b08521420da3da1c68e0a9ffac
parent 24493 5ce67a3a2bd003b461d4b321bba0ecb71991dfb7 (current diff)
parent 24492 c3c596b0c5a3eff5c985bc4bf5e5a3660a6968bf (diff)
child 24495 aca68a29101db3dfe178a1e09abd74b1848d6285
push id5074
push userrsayre@mozilla.com
push dateSat, 31 Jan 2009 19:45:42 +0000
treeherdermozilla-central@f1cade532f6f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.2a1pre
Merge.
js/src/jstracer.cpp
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -1973,17 +1973,16 @@ js_IsLoopEdge(jsbytecode* pc, jsbytecode
     return false;
 }
 
 /* Promote slots if necessary to match the called tree' type map and report error if thats
    impossible. */
 JS_REQUIRES_STACK bool
 TraceRecorder::adjustCallerTypes(Fragment* f)
 {
-    JSTraceMonitor* tm = traceMonitor;
     uint16* gslots = treeInfo->globalSlots->data();
     unsigned ngslots = treeInfo->globalSlots->length();
     JS_ASSERT(ngslots == treeInfo->nGlobalTypes());
     TreeInfo* ti = (TreeInfo*)f->vmprivate;
     bool ok = true;
     uint8* map = ti->globalTypeMap();
     uint8* m = map;
     FORALL_GLOBAL_SLOTS(cx, ngslots, gslots, 
@@ -2637,17 +2636,16 @@ TraceRecorder::closeLoop(JSTraceMonitor*
                         FramePCOffset(cx->fp));)
     return true;
 }
 
 JS_REQUIRES_STACK void
 TraceRecorder::joinEdgesToEntry(Fragmento* fragmento, Fragment* peer_root)
 {
     if (fragment->kind == LoopTrace) {
-        JSTraceMonitor* tm = traceMonitor;
         TreeInfo* ti;
         Fragment* peer;
         uint8* t1, *t2;
         UnstableExit* uexit, **unext;
         uint32* stackDemotes = (uint32*)alloca(sizeof(uint32) * treeInfo->nStackTypes);
         uint32* globalDemotes = (uint32*)alloca(sizeof(uint32) * treeInfo->nGlobalTypes());
 
         for (peer = peer_root; peer != NULL; peer = peer->peer) {