Backed out changeset 8361462f2a02 (bug 1125389) for mochitest asserts.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 27 Jan 2015 15:13:12 -0500
changeset 239493 e79c310fc6594fa66d9a760e7c925d366b8d359a
parent 239492 f579eea5dc026f64bda0510ded041ffd9197f3a6
child 239494 63e93ddb740f2abaf38f63f5ff40f15e59248816
push id500
push userjoshua.m.grant@gmail.com
push dateThu, 29 Jan 2015 01:48:36 +0000
bugs1125389
milestone38.0a1
backs out8361462f2a02c9535b315a7b6e55df9513f5540b
Backed out changeset 8361462f2a02 (bug 1125389) for mochitest asserts.
js/src/vm/Shape.cpp
--- a/js/src/vm/Shape.cpp
+++ b/js/src/vm/Shape.cpp
@@ -635,22 +635,17 @@ js::NewReshapedObject(JSContext *cx, Han
         while (!nshape->isEmptyShape()) {
             ids[nshape->slot()].set(nshape->propid());
             nshape = nshape->previous();
         }
     }
 
     /* 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));
 
         uint32_t index;
         bool indexed = js_IdIsIndex(id, &index);
 
         Rooted<UnownedBaseShape*> nbase(cx, newShape->base()->unowned());