diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/JavaScriptCore/collector/handles/HandleHeap.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/JavaScriptCore/collector/handles/HandleHeap.cpp')
| -rw-r--r-- | Source/JavaScriptCore/collector/handles/HandleHeap.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/collector/handles/HandleHeap.cpp b/Source/JavaScriptCore/collector/handles/HandleHeap.cpp index 32fa42d..1beb407 100644 --- a/Source/JavaScriptCore/collector/handles/HandleHeap.cpp +++ b/Source/JavaScriptCore/collector/handles/HandleHeap.cpp @@ -51,11 +51,11 @@ void HandleHeap::grow() } } -void HandleHeap::markStrongHandles(MarkStack& markStack) +void HandleHeap::markStrongHandles(HeapRootMarker& heapRootMarker) { Node* end = m_strongList.end(); for (Node* node = m_strongList.begin(); node != end; node = node->next()) - markStack.deprecatedAppend(node->slot()); + heapRootMarker.mark(node->slot()); } void HandleHeap::updateAfterMark() @@ -79,7 +79,10 @@ void HandleHeap::clearWeakPointers() JSCell* cell = value.asCell(); ASSERT(!cell || cell->structure()); - + +#if ENABLE(JSC_ZOMBIES) + ASSERT(!cell->isZombie()); +#endif if (Heap::isMarked(cell)) continue; |