Second try at adding interface for JSStackFrame.scopeChain/blockChain, bug 586533. r=lw

2010-08-13 23:36:37 -04:00
parent d0c9250878
commit 0ad3c91bc9
14 changed files with 219 additions and 181 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1144,9 +1144,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. */