Sync with mozilla-central.

js/src/jsopcode.cpp

@@ -62,7 +62,7 @@
 #include "jsdbgapi.h"
 #include "jsemit.h"
 #include "jsfun.h"
-#include "jslock.h"
+#include "jsiter.h"
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jsregexp.h"
@@ -3932,9 +3932,6 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     } else {
                         op = (JSOp) *pc2;
                         op = ((js_CodeSpec[op].format & JOF_PARENHEAD) ||
-                              ((op == JSOP_IFNE || op == JSOP_IFNEX) &&
-                               (!(sn2 = js_GetSrcNote(outer, pc2)) ||
-                                SN_TYPE(sn2) != SRC_GENEXP)) ||
                               ((js_CodeSpec[op].format & JOF_INVOKE) &&
                                GET_ARGC(pc2) == 1) ||
                               ((op == JSOP_IFEQ || op == JSOP_IFEQX) &&
@@ -4595,8 +4592,9 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 inXML = JS_FALSE;
                 break;
 
-              case JSOP_FOREACH:
-                foreach = JS_TRUE;
+              case JSOP_ITER:
+                foreach = (pc[1] & (JSITER_FOREACH | JSITER_KEYVALUE)) ==
+                          JSITER_FOREACH;
                 todo = -2;
                 break;