Merge mozilla-central to tracemonkey.

2010-07-08 18:15:52 -07:00
parent 032bedc45d 18f5f0e78b
commit 0cd6302d63
249 changed files with 20492 additions and 4634 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -341,7 +341,7 @@ JSObject::resizeDenseArrayElements(JSContext *cx, uint32 oldcap, uint32 newcap,
        return JS_TRUE;
    }

-    if (newcap > MAX_DSLOTS_LENGTH) {
+    if (newcap > MAX_DSLOTS_LENGTH32) {
        js_ReportAllocationOverflow(cx);
        return JS_FALSE;
    }