Changeset 53459 in webkit

Timestamp:

Jan 19, 2010 12:25:22 AM (14 years ago)

Author:

barraclough@apple.com

Message:

Reverting r53455, breaks 2 javascriptcore tests.

Reviewed by NOBODY (build fix).

JavaScriptCore:

• API/JSContextRef.cpp:
• runtime/Collector.cpp:

(JSC::Heap::destroy):
(JSC::Heap::freeBlock):
(JSC::Heap::freeBlocks):
(JSC::Heap::shrinkBlocks):

WebCore:

• bindings/js/WorkerScriptController.cpp:

(WebCore::WorkerScriptController::~WorkerScriptController):

LayoutTests:

• fast/workers/resources/worker-gc2.js: Removed.
• fast/workers/worker-gc2.html: Removed.

Location:

trunk

Files:

• JavaScriptCore/API/JSContextRef.cpp (modified) (1 diff)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/Collector.cpp (modified) (4 diffs)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/workers/resources/worker-gc2.js (deleted)
• LayoutTests/fast/workers/worker-gc2.html (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/WorkerScriptController.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -128 +128 @@
     if (globalData.refCount() == 2) { // One reference is held by JSGlobalObject, another added by JSGlobalContextRetain().
         // The last reference was released, this is our last chance to collect.
+        ASSERT(!globalData.heap.protectedObjectCount());
+        ASSERT(!globalData.heap.isBusy());
         globalData.heap.destroy();
     } else

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-01-19  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by NOBODY (build fix).
+
+        Reverting r53455, breaks 2 javascriptcore tests.
+
+        * API/JSContextRef.cpp:
+        * runtime/Collector.cpp:
+        (JSC::Heap::destroy):
+        (JSC::Heap::freeBlock):
+        (JSC::Heap::freeBlocks):
+        (JSC::Heap::shrinkBlocks):
+
 2010-01-18  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -187 +187 @@
         return;
 
-    ASSERT(!m_globalData->dynamicGlobalObject);
-    ASSERT(!isBusy());
-    
     // The global object is not GC protected at this point, so sweeping may delete it
     // (and thus the global data) before other objects that may use the global data.
@@ -294 +291 @@
 NEVER_INLINE void Heap::freeBlock(size_t block)
 {
-    m_heap.didShrink = true;
-
     ObjectIterator it(m_heap, block);
     ObjectIterator end(m_heap, block + 1);
@@ -335 +330 @@
 void Heap::freeBlocks()
 {
-    ProtectCountSet protectedValuesCopy = m_protectedValues;
-
-    clearMarkBits();
-    markProtectedObjects(m_globalData->markStack);
-
-    m_heap.nextCell = 0;
-    m_heap.nextBlock = 0;
-    DeadObjectIterator it(m_heap, m_heap.nextBlock, m_heap.nextCell);
-    DeadObjectIterator end(m_heap, m_heap.usedBlocks);
-    for ( ; it != end; ++it)
-        (*it)->~JSCell();
-
-    ASSERT(!protectedObjectCount());
-
-    ProtectCountSet::iterator protectedValuesEnd = protectedValuesCopy.end();
-    for (ProtectCountSet::iterator protectedValuesIt = protectedValuesCopy.begin(); protectedValuesIt != protectedValuesEnd; ++protectedValuesIt)
-        protectedValuesIt->first->~JSCell();
-
-    for (size_t block = 0; block < m_heap.usedBlocks; ++block)
-        freeBlockPtr(m_heap.blocks[block]);
-
+    while (m_heap.usedBlocks)
+        freeBlock(0);
     fastFree(m_heap.blocks);
-
     memset(&m_heap, 0, sizeof(CollectorHeap));
 }
@@ -466 +441 @@
         if (m_heap.blocks[i]->marked.isEmpty()) {
             freeBlock(i);
+            m_heap.didShrink = true;
         } else
             ++i;

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-19  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by NOBODY (build fix).
+
+        Reverting r53455, breaks 2 javascriptcore tests.
+
+        * fast/workers/resources/worker-gc2.js: Removed.
+        * fast/workers/worker-gc2.html: Removed.
+
 2010-01-19  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-19  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by NOBODY (build fix).
+
+        Reverting r53455, breaks 2 javascriptcore tests.
+
+        * bindings/js/WorkerScriptController.cpp:
+        (WebCore::WorkerScriptController::~WorkerScriptController):
+
 2010-01-18  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/bindings/js/WorkerScriptController.cpp

@@ -59 +59 @@
 {
     m_workerContextWrapper = 0; // Unprotect the global object.
+
+    ASSERT(!m_globalData->heap.protectedObjectCount());
+    ASSERT(!m_globalData->heap.isBusy());
     m_globalData->heap.destroy();
 }