Backout bug 473228 and its follow-up, temporarily, to attempt a clean merge of other stuff.

2009-12-01 09:57:20 -05:00
parent 75de9c410c 6b5e0c1e3d
commit 4042207aec
15 changed files with 718 additions and 903 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1327,8 +1327,8 @@ js_MakeArraySlow(JSContext *cx, JSObject *obj)
            continue;
        }

-        sprop = scope->addDataProperty(cx, id, JS_INITIAL_NSLOTS + i,
-                                       JSPROP_ENUMERATE);
+        sprop = scope->add(cx, id, NULL, NULL, i + JS_INITIAL_NSLOTS,
+                           JSPROP_ENUMERATE, 0, 0);
        if (!sprop)
            goto out_bad;
    }