Merge from Tracemonkey.

2010-08-19 11:11:36 -07:00
parent 4dfb6a4bc5 744f31e312
commit aec1765297
1092 changed files with 46905 additions and 24855 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -3051,12 +3051,7 @@ js_NewArrayObject(JSContext *cx, jsuint length, const Value *vector)
     */
    JS_ASSERT(obj->getProto());

-    if (!InitArrayObject(cx, obj, length, vector))
-        obj = NULL;
-
-    /* Set/clear newborn root, in case we lost it.  */
-    cx->weakRoots.finalizableNewborns[FINALIZE_OBJECT] = obj;
-    return obj;
+    return InitArrayObject(cx, obj, length, vector) ? obj : NULL;
 }

 JSObject *