[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ggaren at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit edf34a600f96446e7ca2df43da13c1cc241cabf7
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 15 03:32:19 2011 +0000

    Reverted accidentally committed code from my last checkin.
    
    * runtime/Heap.cpp:
    (JSC::Heap::markRoots):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75867 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 67460ce..9ae3c17 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-14  Geoffrey Garen  <ggaren at apple.com>
 
+        Reverted accidentally committed code from my last checkin.
+
+        * runtime/Heap.cpp:
+        (JSC::Heap::markRoots):
+
+2011-01-14  Geoffrey Garen  <ggaren at apple.com>
+
         Reviewed by Sam Weinig.
         
         Try to fix the GTK bot.
diff --git a/Source/JavaScriptCore/runtime/Heap.cpp b/Source/JavaScriptCore/runtime/Heap.cpp
index de6928c..a224ee0 100644
--- a/Source/JavaScriptCore/runtime/Heap.cpp
+++ b/Source/JavaScriptCore/runtime/Heap.cpp
@@ -260,49 +260,34 @@ void Heap::markRoots()
 
     m_operationInProgress = Collection;
 
-    // Gather conservative references. We must do this before resetting mark bits
-    // because we rely on mark bits to tell us whether a candidate reference
-    // is valid.
-    HashSet<JSCell*> machineStackReferences;
-    m_machineStackMarker.markMachineStackConservatively(machineStackReferences);
-
-    m_markedSpace.clearMarkBits();
-
     MarkStack& markStack = m_globalData->markStack;
 
-    HashSet<JSCell*>::iterator end = machineStackReferences.end();
-    for (HashSet<JSCell*>::iterator it = machineStackReferences.begin(); it != end; ++it)
-        markStack.append(*it);
-    markStack.drain();
+    // Reset mark bits.
+    m_markedSpace.clearMarkBits();
 
-    // FIXME: Do we need extra conservatism here too?
+    // Mark stack roots.
+    m_machineStackMarker.markMachineStackConservatively(markStack);
     m_globalData->interpreter->registerFile().markCallFrames(markStack, this);
-    markStack.drain();
 
     // Mark explicitly registered roots.
     markProtectedObjects(markStack);
-    markStack.drain();
-
+    
     // Mark temporary vector for Array sorting
     markTempSortVectors(markStack);
-    markStack.drain();
 
     // Mark misc. other roots.
     if (m_markListSet && m_markListSet->size())
         MarkedArgumentBuffer::markLists(markStack, *m_markListSet);
-    markStack.drain();
-
     if (m_globalData->exception)
         markStack.append(m_globalData->exception);
     if (m_globalData->firstStringifierToMark)
         JSONObject::markStringifiers(markStack, m_globalData->firstStringifierToMark);
-    markStack.drain();
 
     // Mark the small strings cache last, since it will clear itself if nothing
     // else has marked it.
     m_globalData->smallStrings.markChildren(markStack);
-    markStack.drain();
 
+    markStack.drain();
     markStack.compact();
 
     updateWeakGCHandles();

-- 
WebKit Debian packaging