Fixed assert (fallout from 462265).

This commit is contained in:
Andreas Gal 2008-10-30 12:31:39 -07:00
parent 948aa93d60
commit 0cc2b0cfdf

View File

@ -1778,7 +1778,7 @@ TraceRecorder::snapshot(ExitType exitType)
bool resumeAfter = (pendingTraceableNative &&
JSTN_ERRTYPE(pendingTraceableNative) == FAIL_JSVAL);
if (resumeAfter) {
JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_NEXTITER);
JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_APPLY || *pc == JSOP_NEXTITER);
pc += cs.length;
regs->pc = pc;
MUST_FLOW_THROUGH(restore_pc);
@ -5989,7 +5989,8 @@ TraceRecorder::record_FastNativeCallComplete()
opcode, and indicate in the type map that the element on top of the
stack is a boxed value which doesn't need to be boxed if the type guard
generated by unbox_jsval() fails. */
JS_ASSERT(*cx->fp->regs->pc == JSOP_CALL);
JS_ASSERT(*cx->fp->regs->pc == JSOP_CALL ||
*cx->fp->regs->pc == JSOP_APPLY);
jsval& v = stackval(-1);
LIns* v_ins = get(&v);