corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 12 changesets (bug 1165486) for windows spidermonkey failures CLOSED TREE

Browse Source 
Backed out changeset ce3c302864bf (bug 1165486)
Backed out changeset f69852001c61 (bug 1165486)
Backed out changeset 06cc09729bf4 (bug 1165486)
Backed out changeset 52772afc023e (bug 1165486)
Backed out changeset 502ddf7d2268 (bug 1165486)
Backed out changeset b04ab7bd78af (bug 1165486)
Backed out changeset 53fcddbe4cfb (bug 1165486)
Backed out changeset 63bd369e5349 (bug 1165486)
Backed out changeset 1e35269a8062 (bug 1165486)
Backed out changeset e3c11d517e18 (bug 1165486)
Backed out changeset ccd90228daf6 (bug 1165486)
Backed out changeset eb11e655d223 (bug 1165486)
This commit is contained in:
Wes Kocher
2015-06-15 18:07:52 -07:00
parent dfa3c5bb31
commit 1eb8d1d335
39 changed files with 707 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsobj.cpp
View File

@@ -1076,7 +1076,7 @@ NewObjectGCKind(const js::Class* clasp)
static inline JSObject*
NewObject(ExclusiveContext* cx, HandleObjectGroup group, gc::AllocKind kind,
NewObjectKind newKind, uint32_t initialShapeFlags = 0)
NewObjectKind newKind)
{
const Class* clasp = group->clasp();
@@ -1091,8 +1091,7 @@ NewObject(ExclusiveContext* cx, HandleObjectGroup group, gc::AllocKind kind,
? GetGCKindSlots(gc::GetGCObjectKind(clasp), clasp)
: GetGCKindSlots(kind, clasp);
RootedShape shape(cx, EmptyShape::getInitialShape(cx, clasp, group->proto(), nfixed,
initialShapeFlags));
RootedShape shape(cx, EmptyShape::getInitialShape(cx, clasp, group->proto(), nfixed));
if (!shape)
return nullptr;
@@ -1140,8 +1139,7 @@ NewObjectWithTaggedProtoIsCachable(ExclusiveContext* cxArg, Handle<TaggedProto>
JSObject*
js::NewObjectWithGivenTaggedProto(ExclusiveContext* cxArg, const Class* clasp,
Handle<TaggedProto> proto,
gc::AllocKind allocKind, NewObjectKind newKind,
uint32_t initialShapeFlags)
gc::AllocKind allocKind, NewObjectKind newKind)
{
if (CanBeFinalizedInBackground(allocKind, clasp))
allocKind = GetBackgroundAllocKind(allocKind);
@@ -1163,7 +1161,7 @@ js::NewObjectWithGivenTaggedProto(ExclusiveContext* cxArg, const Class* clasp,
if (!group)
return nullptr;
RootedObject obj(cxArg, NewObject(cxArg, group, allocKind, newKind, initialShapeFlags));
RootedObject obj(cxArg, NewObject(cxArg, group, allocKind, newKind));
if (!obj)
return nullptr;