Backed out changeset 6d73cc06f9fe (bug 650161) for SM(ggc) timeouts.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 06 Oct 2014 16:03:38 -0400
changeset 209038 beed46f2f2bdb0af949b09c0ad2a6a3beb55c84f
parent 209037 7d96910cd5f9700cce13b82ba39a86bc97f8cf7f
child 209039 b19c3336ea3f1e82d087621ae5b50e99887269ae
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs650161
milestone35.0a1
backs out6d73cc06f9fed9512dd0cd2d531ff1445071679c
Backed out changeset 6d73cc06f9fe (bug 650161) for SM(ggc) timeouts. CLOSED TREE
js/src/jsgc.cpp
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2193,26 +2193,25 @@ RelocateCell(Zone *zone, TenuredCell *sr
     // Copy source cell contents to destination.
     memcpy(dst, src, thingSize);
 
     if (thingKind <= FINALIZE_OBJECT_LAST) {
         JSObject *srcObj = static_cast<JSObject *>(static_cast<Cell *>(src));
         JSObject *dstObj = static_cast<JSObject *>(static_cast<Cell *>(dst));
 
         // Fixup the pointer to inline object elements if necessary.
-        if (srcObj->isNative() && srcObj->as<NativeObject>().hasFixedElements())
-            dstObj->as<NativeObject>().setFixedElements();
+        if (srcObj->hasFixedElements())
+            dstObj->setFixedElements();
 
         // Call object moved hook if present.
         if (JSObjectMovedOp op = srcObj->getClass()->ext.objectMovedOp)
             op(dstObj, srcObj);
 
         MOZ_ASSERT_IF(dstObj->isNative(),
-                      !PtrIsInRange((const Value*)dstObj->as<NativeObject>().getDenseElements(),
-                                    src, thingSize));
+                      !PtrIsInRange((const Value*)dstObj->getDenseElements(), src, thingSize));
     }
 
     // Copy the mark bits.
     dst->copyMarkBitsFrom(src);
 
     // Mark source cell as forwarded and leave a pointer to the destination.
     RelocationOverlay* overlay = RelocationOverlay::fromCell(src);
     overlay->forwardTo(dst);