Changeset 77360 in webkit for trunk/Source/JavaScriptCore/runtime/Heap.cpp

Timestamp:

Feb 1, 2011, 9:05:55 PM (14 years ago)

Author:

[email protected]

Message:

2011-02-01 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r77297.
​http://trac.webkit.org/changeset/77297
​https://bugs.webkit.org/show_bug.cgi?id=53538

caused leopard crashes (Requested by paroga on #webkit).

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• wtf/text/AtomicString.cpp: (WTF::AtomicString::fromUTF8):
• wtf/unicode/UTF8.cpp: (WTF::Unicode::calculateStringHashFromUTF8):
• wtf/unicode/UTF8.h:

File:

• trunk/Source/JavaScriptCore/runtime/Heap.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/Heap.cpp

@@ -22 +22 @@
 #include "Heap.h"
 
+#include "CodeBlock.h"
 #include "CollectorHeapIterator.h"
 #include "ConservativeSet.h"
@@ -251 +252 @@
     markTempSortVectors(markStack);
     markStack.drain();
+    
+    HashSet<GlobalCodeBlock*>::const_iterator end = m_codeBlocks.end();
+    for (HashSet<GlobalCodeBlock*>::const_iterator it = m_codeBlocks.begin(); it != end; ++it)
+        (*it)->markAggregate(markStack);
+    markStack.drain();
 
     // Mark misc. other roots.
@@ -290 +296 @@
 size_t Heap::globalObjectCount()
 {
+    return m_globalData->globalObjects.uncheckedSize();
+}
+
+size_t Heap::protectedGlobalObjectCount()
+{
     size_t count = 0;
-    if (JSGlobalObject* head = m_globalData->head) {
-        JSGlobalObject* o = head;
-        do {
+
+    GlobalObjectMap& map = m_globalData->globalObjects;
+    GlobalObjectMap::iterator end = map.uncheckedEnd();
+    for (GlobalObjectMap::iterator it = map.uncheckedBegin(); it != end; ++it) {
+        if (map.isValid(it) && m_protectedValues.contains(it->second.get()))
             ++count;
-            o = o->next();
-        } while (o != head);
-    }
-    return count;
-}
-
-size_t Heap::protectedGlobalObjectCount()
-{
-    size_t count = 0;
-    if (JSGlobalObject* head = m_globalData->head) {
-        JSGlobalObject* o = head;
-        do {
-            if (m_protectedValues.contains(o))
-                ++count;
-            o = o->next();
-        } while (o != head);
     }