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-19 17:30:04 -07:00
parent 9477cf06d3 3e4d1557c4
commit 8082f24cee
9 changed files with 101 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsiter.cpp
View File

@@ -1141,8 +1141,8 @@ js_NewGenerator(JSContext *cx)
/* Load and compute stack slot counts. */
JSStackFrame *fp = cx->fp;
uintN argc = fp->argc;
uintN nargs = JS_MAX(argc, fp->getArgumentCount());
uintN argc = fp->numActualArgs();
uintN nargs = JS_MAX(argc, fp->numFormalArgs());
uintN vplen = 2 + nargs;
/* Compute JSGenerator size. */
@@ -1185,7 +1185,7 @@ js_NewGenerator(JSContext *cx)
newfp->setScript(fp->getScript());
newfp->setFunction(fp->getFunction());
newfp->setThisValue(fp->getThisValue());
newfp->argc = fp->argc;
newfp->setNumActualArgs(fp->numActualArgs());
newfp->argv = vp + 2;
newfp->setReturnValue(fp->getReturnValue());
newfp->setAnnotation(NULL);