Bug 475474 - Minor followups to fix build warnings and trace-test output, r=danderson.
--- 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) {
--- a/js/src/trace-test.js
+++ b/js/src/trace-test.js
@@ -2482,17 +2482,17 @@ function testWeirdDateParse() {
}
testWeirdDateParse.expected = "11,17,2008,11,17,2008,11,17,2008,11,17,2008,11,17,2008";
testWeirdDateParse.jitstats = {
recorderStarted: 7,
recorderAborted: 1,
traceCompleted: 6,
traceTriggered: 14,
unstableLoopVariable: 3,
- noCompatInnerTrees: 1
+ noCompatInnerTrees: 0
};
test(testWeirdDateParse);
function testUndemotableBinaryOp() {
var out = [];
for (let j = 0; j < 5; ++j) { out.push(6 - ((void 0) ^ 0x80000005)); }
return out.join(",");
}