[JAEGER] Merge from Tracemonkey.

js/src/jsiter.cpp

@@ -1172,7 +1172,6 @@ js_NewGenerator(JSContext *cx)
     gen->liveFrame = newfp;
 
     /* Copy generator's stack frame copy in from |cx->fp|. */
-    newfp->imacpc = NULL;
     newfp->setCallObj(fp->maybeCallObj());
     if (fp->hasCallObj()) {      /* Steal call object. */
         fp->getCallObj()->setPrivate(newfp);
@@ -1194,6 +1193,7 @@ js_NewGenerator(JSContext *cx)
     JS_ASSERT(!fp->hasBlockChain());
     newfp->setBlockChain(NULL);
     newfp->flags = fp->flags | JSFRAME_GENERATOR | JSFRAME_FLOATING_GENERATOR;
+    JS_ASSERT(!newfp->hasIMacroPC());
 
     /* Copy in arguments and slots. */
     memcpy(vp, fp->argv - 2, vplen * sizeof(Value));