[JAEGER] Merge from tracemonkey.

2010-08-25 11:00:41 -07:00
parent c6d0d5ae6d 9800657f2f
commit aaecd20ded
41 changed files with 2303 additions and 1704 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1275,7 +1275,7 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
         * Get a pointer to new frame/slots. This memory is not "claimed", so
         * the code before pushExecuteFrame must not reenter the interpreter.
         */
-        ExecuteFrameGuard frame;
+        FrameGuard frame;
        if (!cx->stack().getExecuteFrame(cx, cx->maybefp(), vplen, nfixed, frame)) {
            gen->state = JSGEN_CLOSED;
            return JS_FALSE;