Backed out changeset 1406935fced4. Brian Hackett – Put JSStackFrame.scopeChain/blockChain behind an interface, bug 586533. r=lw.

2010-08-12 21:47:46 -07:00
parent 8611f657c5
commit a48d36560d
14 changed files with 180 additions and 218 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->setScopeChain(fp->maybeScopeChain());
-    JS_ASSERT(!fp->hasBlockChain());
-    newfp->setBlockChain(NULL);
+    newfp->scopeChain = fp->scopeChain;
+    JS_ASSERT(!fp->blockChain);
+    newfp->blockChain = NULL;
    newfp->flags = fp->flags | JSFRAME_GENERATOR | JSFRAME_FLOATING_GENERATOR;

    /* Copy in arguments and slots. */