corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[INFER] Inline scripted calls, bug 639099.

Browse Source
This commit is contained in:
Brian Hackett
2011-03-26 19:07:13 -07:00
parent 02baa65cdb
commit 9361c5f2fa
61 changed files with 2601 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsiter.cpp
View File

@@ -377,15 +377,9 @@ GetCustomIterator(JSContext *cx, JSObject *obj, uintN flags, Value *vp)
* if this is coming from a 'for in' loop, not a call to Iterator itself.
* If an Iterator object is used in a for loop then the values fetched in
* that loop are unknown, whether there is a custom __iterator__ or not.
* Watch out for the case where this iteration request came through a
* cross-compartment wrapper, where cx->regs->pc is NULL. The iteration
* value will have already been marked as unknown by the wrapper.
*/
if (!(flags & JSITER_OWNONLY) && cx->regs->pc) {
JS_ASSERT(JSOp(*cx->regs->pc) == JSOP_ITER);
if (!cx->fp()->script()->typeMonitorUnknown(cx, cx->regs->pc))
return false;
}
if (!(flags & JSITER_OWNONLY) && !cx->markTypeCallerUnexpected(types::TYPE_UNKNOWN))
return false;
/* Otherwise call it and return that object. */
LeaveTrace(cx);