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

[JAEGER] Merge from Tracemonkey. scopeChain and blockChain are still public so I can check one thing at a time--this merge is brutal.

Browse Source
This commit is contained in:
David Mandelin
2010-08-16 14:59:44 -07:00
parent c9e899d28b 0ad3c91bc9
commit b079d2eb22
14 changed files with 220 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsiter.cpp
View File

@@ -1190,9 +1190,9 @@ js_NewGenerator(JSContext *cx)
newfp->argv = vp + 2;
newfp->rval = fp->rval;
newfp->annotation = NULL;
newfp->scopeChain = fp->scopeChain;
JS_ASSERT(!fp->blockChain);
newfp->blockChain = NULL;
newfp->setScopeChain(fp->maybeScopeChain());
JS_ASSERT(!fp->hasBlockChain());
newfp->setBlockChain(NULL);
newfp->flags = fp->flags | JSFRAME_GENERATOR | JSFRAME_FLOATING_GENERATOR;
/* Copy in arguments and slots. */
@@ -1320,7 +1320,7 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
JSObject *enumerators = cx->enumerators;
cx->enumerators = gen->enumerators;
ok = RunScript(cx, fp->script, fp->fun, fp->scopeChain);
ok = RunScript(cx, fp->script, fp->fun, fp->getScopeChain());
/* Restore the original enumerators stack. */
gen->enumerators = cx->enumerators;