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

Move cx->fp to cx->regs->fp, bug 588978. r=lw

Browse Source
This commit is contained in:
Brian Hackett
2010-08-22 16:00:20 -07:00
parent 409eecbc4f
commit 4093659c9b
20 changed files with 432 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsiter.cpp
View File

@@ -1140,7 +1140,7 @@ js_NewGenerator(JSContext *cx)
return NULL;
/* Load and compute stack slot counts. */
JSStackFrame *fp = cx->fp;
JSStackFrame *fp = cx->fp();
uintN argc = fp->numActualArgs();
uintN nargs = JS_MAX(argc, fp->numFormalArgs());
uintN vplen = 2 + nargs;
@@ -1276,7 +1276,7 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
* the code before pushExecuteFrame must not reenter the interpreter.
*/
ExecuteFrameGuard frame;
if (!cx->stack().getExecuteFrame(cx, cx->fp, vplen, nfixed, frame)) {
if (!cx->stack().getExecuteFrame(cx, cx->maybefp(), vplen, nfixed, frame)) {
gen->state = JSGEN_CLOSED;
return JS_FALSE;
}