Backed out changeset 8361462f2a02 (bug 1125389) for mochitest asserts.

This commit is contained in:
Ryan VanderMeulen 2015-01-27 15:13:12 -05:00
parent 891e76e1c7
commit 425ae6574c

View File

@ -640,12 +640,7 @@ js::NewReshapedObject(JSContext *cx, HandleTypeObject type, JSObject *parent,
/* Construct the new shape, without updating type information. */
RootedId id(cx);
RootedShape newShape(cx, EmptyShape::getInitialShape(cx, res->getClass(),
res->getTaggedProto(),
res->getMetadata(),
res->getParent(),
res->numFixedSlots(),
shape->getObjectFlags()));
RootedShape newShape(cx, res->lastProperty());
for (unsigned i = 0; i < ids.length(); i++) {
id = ids[i];
MOZ_ASSERT(!res->contains(cx, id));