Merge from mozilla-central.

js/src/jsiter.cpp

@@ -35,6 +35,8 @@
 #include "jsxml.h"
 #endif
 
+#include "builtin/ParallelArray.h"
+
 #include "ds/Sort.h"
 #include "frontend/TokenStream.h"
 #include "gc/Marking.h"
@@ -43,6 +45,7 @@
 #include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
+#include "builtin/ParallelArray-inl.h"
 #include "builtin/Iterator-inl.h"
 #include "vm/Stack-inl.h"
 #include "vm/String-inl.h"
@@ -226,6 +229,14 @@ Snapshot(JSContext *cx, RawObject obj_, unsigned flags, AutoIdVector *props)
         } else if (pobj->isDenseArray()) {
             if (!EnumerateDenseArrayProperties(cx, obj, pobj, flags, ht, props))
                 return false;
+        } else if (ParallelArrayObject::is(pobj)) {
+            if (!ParallelArrayObject::enumerate(cx, pobj, flags, props))
+                return false;
+            /*
+             * ParallelArray objects enumerate the prototype on their own, so
+             * we are done here.
+             */
+            break;
         } else {
             if (pobj->isProxy()) {
                 AutoIdVector proxyProps(cx);