Changeset 163450 in webkit for trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp

Timestamp:

Feb 5, 2014, 9:31:47 AM (11 years ago)

Author:

[email protected]

Message:

Malloc called beneath MachineThreads::gatherFromOtherThread(), while forbidden
​https://bugs.webkit.org/show_bug.cgi?id=128202

Reviewed by Geoffrey Garen.

This patch uses the new GCSegmentedArray to replace the Vector that was used
to record the set of currently executing CodeBlocks during the conservative
stack scan. This is primarily to avoid the possibility of the Vector resizing
while FastMalloc is forbidden.

• heap/BlockAllocator.h:
• heap/CodeBlockSet.cpp:

(JSC::CodeBlockSet::CodeBlockSet):
(JSC::CodeBlockSet::rememberCurrentlyExecutingCodeBlocks):

• heap/CodeBlockSet.h:
• heap/GCSegmentedArray.h:

(JSC::GCSegmentedArray::begin):
(JSC::GCSegmentedArray::end):
(JSC::GCSegmentedArrayIterator::GCSegmentedArrayIterator):
(JSC::GCSegmentedArrayIterator::get):
(JSC::GCSegmentedArrayIterator::operator*):
(JSC::GCSegmentedArrayIterator::operator->):
(JSC::GCSegmentedArrayIterator::operator==):
(JSC::GCSegmentedArrayIterator::operator!=):
(JSC::GCSegmentedArrayIterator::operator++):

• heap/Heap.cpp:

(JSC::Heap::Heap):

File:

• trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp

@@ -34 +34 @@
 static const bool verbose = false;
 
-CodeBlockSet::CodeBlockSet() { }
+CodeBlockSet::CodeBlockSet(BlockAllocator& blockAllocator)
+    : m_currentlyExecuting(blockAllocator)
+{
+}
 
 CodeBlockSet::~CodeBlockSet()
@@ -110 +113 @@
 {
 #if ENABLE(GGC)
-    for (size_t i = 0; i < m_currentlyExecuting.size(); ++i)
-        heap->addToRememberedSet(m_currentlyExecuting[i]->ownerExecutable());
+    for (CodeBlock* codeBlock : m_currentlyExecuting)
+        heap->addToRememberedSet(codeBlock->ownerExecutable());
     m_currentlyExecuting.clear();
 #else