Merge failure fix (bug 497948 fallout).

This commit is contained in:
David Anderson 2009-08-07 17:30:56 -07:00
parent 146159019c
commit aaa22d1c75

View File

@ -3772,6 +3772,7 @@ TraceRecorder::closeLoop(SlotMap& slotMap, VMSideExit* exit, TypeConsensus& cons
Assembler *assm = JS_TRACE_MONITOR(cx).assembler;
if (assm->error() != nanojit::None)
return false;
peer = getLoop(traceMonitor, root->ip, root->globalObj, root->globalShape, root->argc);
JS_ASSERT(peer);