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

[JAEGER] Merge from tracemonkey.

Browse Source
This commit is contained in:
David Mandelin
2010-08-13 12:01:02 -07:00
parent 42d0a242d3 df334cd4c5
commit 6f433a7221
21 changed files with 470 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/src/jsiter.cpp
View File

@@ -1173,15 +1173,15 @@ js_NewGenerator(JSContext *cx)
/* Copy generator's stack frame copy in from |cx->fp|. */
newfp->imacpc = NULL;
newfp->callobj = fp->callobj;
if (fp->callobj) { /* Steal call object. */
fp->callobj->setPrivate(newfp);
fp->callobj = NULL;
newfp->setCallObj(fp->maybeCallObj());
if (fp->hasCallObj()) { /* Steal call object. */
fp->getCallObj()->setPrivate(newfp);
fp->setCallObj(NULL);
}
newfp->argsobj = fp->argsobj;
if (fp->argsobj) { /* Steal args object. */
fp->argsobj->setPrivate(newfp);
fp->argsobj = NULL;
newfp->setArgsObj(fp->maybeArgsObj());
if (fp->hasArgsObj()) { /* Steal args object. */
fp->getArgsObj()->setPrivate(newfp);
fp->setArgsObj(NULL);
}
newfp->script = fp->script;
newfp->fun = fp->fun;
@@ -1296,8 +1296,8 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
JS_ASSERT(uintN(gen->savedRegs.sp - fp->slots()) <= fp->script->nslots);
#ifdef DEBUG
JSObject *callobjBefore = fp->callobj;
JSObject *argsobjBefore = fp->argsobj;
JSObject *callobjBefore = fp->maybeCallObj();
JSObject *argsobjBefore = fp->maybeArgsObj();
#endif
/*
@@ -1306,10 +1306,10 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
* pointers to them. Block and With objects are done indirectly through
* 'liveFrame'. See js_LiveFrameToFloating comment in jsiter.h.
*/
if (genfp->callobj)
fp->callobj->setPrivate(fp);
if (genfp->argsobj)
fp->argsobj->setPrivate(fp);
if (genfp->hasCallObj())
fp->getCallObj()->setPrivate(fp);
if (genfp->hasArgsObj())
fp->getArgsObj()->setPrivate(fp);
gen->liveFrame = fp;
(void)cx->enterGenerator(gen); /* OOM check above. */
@@ -1329,13 +1329,13 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
/* Restore call/args/block objects. */
cx->leaveGenerator(gen);
gen->liveFrame = genfp;
if (fp->argsobj)
fp->argsobj->setPrivate(genfp);
if (fp->callobj)
fp->callobj->setPrivate(genfp);
if (fp->hasArgsObj())
fp->getArgsObj()->setPrivate(genfp);
if (fp->hasCallObj())
fp->getCallObj()->setPrivate(genfp);
JS_ASSERT_IF(argsobjBefore, argsobjBefore == fp->argsobj);
JS_ASSERT_IF(callobjBefore, callobjBefore == fp->callobj);
JS_ASSERT_IF(argsobjBefore, argsobjBefore == fp->maybeArgsObj());
JS_ASSERT_IF(callobjBefore, callobjBefore == fp->maybeCallObj());
/* Copy and rebase stack frame/args/slots. Restore "floating" flag. */
JS_ASSERT(uintN(gen->savedRegs.sp - fp->slots()) <= fp->script->nslots);