Backout bug 639227 due to orange.

2011-03-06 21:37:13 -08:00
parent 8b96babfed
commit e2ecb615ac
12 changed files with 27 additions and 20 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -984,7 +984,7 @@ Class js_ArrayClass = {
    NULL,           /* construct   */
    NULL,           /* xdrObject   */
    NULL,           /* hasInstance */
-    array_trace,    /* trace       */
+    NULL,           /* mark        */
    JS_NULL_CLASS_EXT,
    {
        array_lookupProperty,
@@ -996,6 +996,7 @@ Class js_ArrayClass = {
        array_deleteProperty,
        NULL,       /* enumerate      */
        array_typeOf,
+        array_trace,
        array_fix,
        NULL,       /* thisObject     */
        NULL,       /* clear          */