Merge from mozilla-central.

2012-04-30 12:53:32 -07:00
parent 0c72e67bd8 a374a3298d
commit 063a2ce15e
2933 changed files with 112379 additions and 115161 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1449,7 +1449,7 @@ js_NewGenerator(JSContext *cx)
    JS_ASSERT(stackfp->base() == cx->regs().sp);
    JS_ASSERT(stackfp->actualArgs() <= stackfp->formalArgs());

-    GlobalObject *global = &stackfp->scopeChain().global();
+    GlobalObject *global = &stackfp->global();
    JSObject *proto = global->getOrCreateGeneratorPrototype(cx);
    if (!proto)
        return NULL;