Backed out changeset e7f298d7b17b (bug 829602) for frequent B2G mochitest crashes on a CLOSED TREE.
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
#include "jsproxy.h"
|
||||
#include "jsscript.h"
|
||||
|
||||
#include "builtin/ParallelArray.h"
|
||||
#include "ds/Sort.h"
|
||||
#include "frontend/TokenStream.h"
|
||||
#include "gc/Marking.h"
|
||||
@@ -40,6 +41,7 @@
|
||||
#include "jsobjinlines.h"
|
||||
|
||||
#include "builtin/Iterator-inl.h"
|
||||
#include "builtin/ParallelArray-inl.h"
|
||||
#include "vm/Stack-inl.h"
|
||||
#include "vm/String-inl.h"
|
||||
|
||||
@@ -201,6 +203,14 @@ Snapshot(JSContext *cx, RawObject pobj_, unsigned flags, AutoIdVector *props)
|
||||
return false;
|
||||
if (!EnumerateNativeProperties(cx, 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);
|
||||
|
||||
Reference in New Issue
Block a user