Changeset 28110 in webkit for trunk/JavaScriptCore/kjs/property_map.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/property_map.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -623 +623 @@
 }
 
-void PropertyMap::markChildren(MarkStack& stack) const
-{
-    if (!m_usingTable) {
-#if USE_SINGLE_ENTRY
-        if (m_singleEntryKey)
-            stack.push(m_u.singleEntryValue);
+void PropertyMap::mark() const
+{
+    if (!m_usingTable) {
+#if USE_SINGLE_ENTRY
+        if (m_singleEntryKey) {
+            JSValue* v = m_u.singleEntryValue;
+            if (!v->marked())
+                v->mark();
+        }
 #endif
         return;
@@ -634 +637 @@
 
     unsigned entryCount = m_u.table->keyCount + m_u.table->deletedSentinelCount;
-    for (unsigned i = 1; i <= entryCount; i++)
-        stack.push(m_u.table->entries()[i].value);
+    for (unsigned i = 1; i <= entryCount; i++) {
+        JSValue* v = m_u.table->entries()[i].value;
+        if (!v->marked())
+            v->mark();
+    }
 }