Changeset 28110 in webkit for trunk/JavaScriptCore/kjs/array_instance.cpp

Timestamp:

Nov 28, 2007, 5:12:03 AM (18 years ago)

Author:

[email protected]

Message:

Roll out r28106 and r28108. These introduced a frequent assertion failure on page load and broke all non-Mac builds.

File:

• trunk/JavaScriptCore/kjs/array_instance.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/array_instance.cpp

@@ -403 +403 @@
 }
 
-void ArrayInstance::markChildren(MarkStack& stack)
-{
-    JSObject::markChildren(stack);
+void ArrayInstance::mark()
+{
+    JSObject::mark();
 
     ArrayStorage* storage = m_storage;
@@ -412 +412 @@
     for (unsigned i = 0; i < usedVectorLength; ++i) {
         JSValue* value = storage->m_vector[i];
-        if (value)
-            stack.push(value);
+        if (value && !value->marked())
+            value->mark();
     }
 
     if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
         SparseArrayValueMap::iterator end = map->end();
-        for (SparseArrayValueMap::iterator it = map->begin(); it != end; ++it)
-            stack.push(it->second);
+        for (SparseArrayValueMap::iterator it = map->begin(); it != end; ++it) {
+            JSValue* value = it->second;
+            if (!value->marked())
+                value->mark();
+        }
     }
 }