Another followup for 536564, assertion fix.
Another followup for 536564, assertion fix.
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -6741,17 +6741,17 @@ LeaveTree(InterpState& state, VMSideExit
* ExecuteTree. We are about to return to the interpreter. Adjust
* the top stack frame to resume on the next op.
*/
JSFrameRegs* regs = cx->fp->regs;
JSOp op = (JSOp) *regs->pc;
JS_ASSERT(op == JSOP_CALL || op == JSOP_APPLY || op == JSOP_NEW ||
op == JSOP_GETPROP || op == JSOP_GETTHISPROP || op == JSOP_GETARGPROP ||
op == JSOP_GETLOCALPROP || op == JSOP_LENGTH ||
- op == JSOP_GETELEM || op == JSOP_CALLELEM ||
+ op == JSOP_GETELEM || op == JSOP_CALLELEM || op == JSOP_CALLPROP ||
op == JSOP_SETPROP || op == JSOP_SETNAME || op == JSOP_SETMETHOD ||
op == JSOP_SETELEM || op == JSOP_INITELEM || op == JSOP_ENUMELEM ||
op == JSOP_INSTANCEOF);
/*
* JSOP_SETELEM can be coalesced with a JSOP_POP in the interpeter.
* Since this doesn't re-enter the recorder, the post-state snapshot
* is invalid. Fix it up here.