Merge TM -> JM

2011-03-14 22:41:04 -07:00
parent 85e5d56060 88a1a27c56
commit f24b762afb
34 changed files with 391 additions and 230 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -971,8 +971,7 @@ array_trace(JSTracer *trc, JSObject *obj)
    JS_ASSERT(obj->isDenseArray());

    uint32 capacity = obj->getDenseArrayInitializedLength();
-    for (uint32 i = 0; i < capacity; i++)
-        MarkValue(trc, obj->getDenseArrayElement(i), "dense_array_elems");
+    MarkValueRange(trc, capacity, obj->slots, "element");
 }

 static JSBool