Bug 656381 - Handle JSOP_TRAP when looking up block chain (r=dmandelin)

This commit is contained in:
Bill McCloskey 2011-05-18 10:30:39 -07:00
parent 960a3d7b07
commit 88f9a88fb1
2 changed files with 6 additions and 2 deletions

View File

@ -0,0 +1,5 @@
// |jit-test| debug
var f = (function () {with ({}) {}});
dis(f);
trap(f, 5, ''); // trap "nullblockchain" op
f();

View File

@ -199,9 +199,8 @@ js::GetBlockChainFast(JSContext *cx, StackFrame *fp, JSOp op, size_t oplen)
pc += oplen;
op = JSOp(*pc);
JS_ASSERT(js_GetOpcode(cx, fp->script(), pc) == op);
/* The fast paths assume no JSOP_RESETBASE/INDEXBASE noise. */
/* The fast paths assume no JSOP_RESETBASE/INDEXBASE or JSOP_TRAP noise. */
if (op == JSOP_NULLBLOCKCHAIN)
return NULL;
if (op == JSOP_BLOCKCHAIN)