<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179348] trunk/Source/JavaScriptCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179348">179348</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-29 11:20:06 -0800 (Thu, 29 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
https://bugs.webkit.org/show_bug.cgi?id=140900

Reviewed by Mark Hahnenberg.

Re-landing just the GCArraySegment piece of this patch.

* heap/CodeBlockSet.cpp:
(JSC::CodeBlockSet::CodeBlockSet):
* heap/CodeBlockSet.h:
* heap/GCSegmentedArray.h:
(JSC::GCArraySegment::GCArraySegment):
* heap/GCSegmentedArrayInlines.h:
(JSC::GCSegmentedArray&lt;T&gt;::GCSegmentedArray):
(JSC::GCSegmentedArray&lt;T&gt;::~GCSegmentedArray):
(JSC::GCSegmentedArray&lt;T&gt;::clear):
(JSC::GCSegmentedArray&lt;T&gt;::expand):
(JSC::GCSegmentedArray&lt;T&gt;::refill):
(JSC::GCArraySegment&lt;T&gt;::create):
(JSC::GCArraySegment&lt;T&gt;::destroy):
* heap/GCThreadSharedData.cpp:
(JSC::GCThreadSharedData::GCThreadSharedData):
* heap/Heap.cpp:
(JSC::Heap::Heap):
* heap/MarkStack.cpp:
(JSC::MarkStackArray::MarkStackArray):
* heap/MarkStack.h:
* heap/SlotVisitor.cpp:
(JSC::SlotVisitor::SlotVisitor):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSetcpp">trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSeth">trunk/Source/JavaScriptCore/heap/CodeBlockSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCSegmentedArrayh">trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCSegmentedArrayInlinesh">trunk/Source/JavaScriptCore/heap/GCSegmentedArrayInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCThreadSharedDatacpp">trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkStackcpp">trunk/Source/JavaScriptCore/heap/MarkStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkStackh">trunk/Source/JavaScriptCore/heap/MarkStack.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSlotVisitorcpp">trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-01-28  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
+        https://bugs.webkit.org/show_bug.cgi?id=140900
+
+        Reviewed by Mark Hahnenberg.
+
+        Re-landing just the GCArraySegment piece of this patch.
+
+        * heap/CodeBlockSet.cpp:
+        (JSC::CodeBlockSet::CodeBlockSet):
+        * heap/CodeBlockSet.h:
+        * heap/GCSegmentedArray.h:
+        (JSC::GCArraySegment::GCArraySegment):
+        * heap/GCSegmentedArrayInlines.h:
+        (JSC::GCSegmentedArray&lt;T&gt;::GCSegmentedArray):
+        (JSC::GCSegmentedArray&lt;T&gt;::~GCSegmentedArray):
+        (JSC::GCSegmentedArray&lt;T&gt;::clear):
+        (JSC::GCSegmentedArray&lt;T&gt;::expand):
+        (JSC::GCSegmentedArray&lt;T&gt;::refill):
+        (JSC::GCArraySegment&lt;T&gt;::create):
+        (JSC::GCArraySegment&lt;T&gt;::destroy):
+        * heap/GCThreadSharedData.cpp:
+        (JSC::GCThreadSharedData::GCThreadSharedData):
+        * heap/Heap.cpp:
+        (JSC::Heap::Heap):
+        * heap/MarkStack.cpp:
+        (JSC::MarkStackArray::MarkStackArray):
+        * heap/MarkStack.h:
+        * heap/SlotVisitor.cpp:
+        (JSC::SlotVisitor::SlotVisitor):
+
</ins><span class="cx"> 2015-01-29  Csaba Osztrogon√°c  &lt;ossy@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Move HAVE_DTRACE definition back to Platform.h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> 
</span><span class="cx"> static const bool verbose = false;
</span><span class="cx"> 
</span><del>-CodeBlockSet::CodeBlockSet(BlockAllocator&amp; blockAllocator)
-    : m_currentlyExecuting(blockAllocator)
</del><ins>+CodeBlockSet::CodeBlockSet()
+    : m_currentlyExecuting()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.h (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.h        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.h        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><del>-class BlockAllocator;
</del><span class="cx"> class CodeBlock;
</span><span class="cx"> class Heap;
</span><span class="cx"> class JSCell;
</span><span class="lines">@@ -50,7 +49,7 @@
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(CodeBlockSet);
</span><span class="cx"> 
</span><span class="cx"> public:
</span><del>-    CodeBlockSet(BlockAllocator&amp;);
</del><ins>+    CodeBlockSet();
</ins><span class="cx">     ~CodeBlockSet();
</span><span class="cx">     
</span><span class="cx">     // Add a CodeBlock. This is only called by CodeBlock constructors.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCSegmentedArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -26,26 +26,25 @@
</span><span class="cx"> #ifndef GCSegmentedArray_h
</span><span class="cx"> #define GCSegmentedArray_h
</span><span class="cx"> 
</span><del>-#include &quot;HeapBlock.h&quot;
</del><ins>+#include &lt;wtf/DoublyLinkedList.h&gt;
</ins><span class="cx"> #include &lt;wtf/Vector.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><del>-class BlockAllocator;
-class DeadBlock;
-
</del><span class="cx"> template &lt;typename T&gt;
</span><del>-class GCArraySegment : public HeapBlock&lt;GCArraySegment&lt;T&gt;&gt; {
</del><ins>+class GCArraySegment : public DoublyLinkedListNode&lt;GCArraySegment&lt;T&gt;&gt; {
+    friend class WTF::DoublyLinkedListNode&lt;GCArraySegment&lt;T&gt;&gt;;
</ins><span class="cx"> public:
</span><del>-    GCArraySegment(Region* region)
-        : HeapBlock&lt;GCArraySegment&gt;(region)
</del><ins>+    GCArraySegment()
+        : DoublyLinkedListNode&lt;GCArraySegment&lt;T&gt;&gt;()
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx">         , m_top(0)
</span><span class="cx"> #endif
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    static GCArraySegment* create(DeadBlock*);
</del><ins>+    static GCArraySegment* create();
+    static void destroy(GCArraySegment*);
</ins><span class="cx"> 
</span><span class="cx">     T* data()
</span><span class="cx">     {
</span><span class="lines">@@ -54,6 +53,8 @@
</span><span class="cx"> 
</span><span class="cx">     static const size_t blockSize = 4 * KB;
</span><span class="cx"> 
</span><ins>+    GCArraySegment* m_prev;
+    GCArraySegment* m_next;
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx">     size_t m_top;
</span><span class="cx"> #endif
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx">     friend class GCSegmentedArrayIterator&lt;T&gt;;
</span><span class="cx">     friend class GCSegmentedArrayIterator&lt;const T&gt;;
</span><span class="cx"> public:
</span><del>-    GCSegmentedArray(BlockAllocator&amp;);
</del><ins>+    GCSegmentedArray();
</ins><span class="cx">     ~GCSegmentedArray();
</span><span class="cx"> 
</span><span class="cx">     void append(T);
</span><span class="lines">@@ -101,7 +102,6 @@
</span><span class="cx">     void validatePrevious();
</span><span class="cx"> 
</span><span class="cx">     DoublyLinkedList&lt;GCArraySegment&lt;T&gt;&gt; m_segments;
</span><del>-    BlockAllocator&amp; m_blockAllocator;
</del><span class="cx"> 
</span><span class="cx">     JS_EXPORT_PRIVATE static const size_t s_segmentCapacity = CapacityFromSize&lt;GCArraySegment&lt;T&gt;::blockSize&gt;::value;
</span><span class="cx">     size_t m_top;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCSegmentedArrayInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCSegmentedArrayInlines.h (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCSegmentedArrayInlines.h        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/GCSegmentedArrayInlines.h        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -26,18 +26,16 @@
</span><span class="cx"> #ifndef GCSegmentedArrayInlines_h
</span><span class="cx"> #define GCSegmentedArrayInlines_h
</span><span class="cx"> 
</span><del>-#include &quot;BlockAllocator.h&quot;
</del><span class="cx"> #include &quot;GCSegmentedArray.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><span class="cx"> template &lt;typename T&gt;
</span><del>-GCSegmentedArray&lt;T&gt;::GCSegmentedArray(BlockAllocator&amp; blockAllocator)
-    : m_blockAllocator(blockAllocator)
-    , m_top(0)
</del><ins>+GCSegmentedArray&lt;T&gt;::GCSegmentedArray()
+    : m_top(0)
</ins><span class="cx">     , m_numberOfSegments(0)
</span><span class="cx"> {
</span><del>-    m_segments.push(GCArraySegment&lt;T&gt;::create(m_blockAllocator.allocate&lt;GCArraySegment&lt;T&gt;&gt;()));
</del><ins>+    m_segments.push(GCArraySegment&lt;T&gt;::create());
</ins><span class="cx">     m_numberOfSegments++;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -46,7 +44,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_numberOfSegments == 1);
</span><span class="cx">     ASSERT(m_segments.size() == 1);
</span><del>-    m_blockAllocator.deallocate(GCArraySegment&lt;T&gt;::destroy(m_segments.removeHead()));
</del><ins>+    GCArraySegment&lt;T&gt;::destroy(m_segments.removeHead());
</ins><span class="cx">     m_numberOfSegments--;
</span><span class="cx">     ASSERT(!m_numberOfSegments);
</span><span class="cx">     ASSERT(!m_segments.size());
</span><span class="lines">@@ -61,7 +59,7 @@
</span><span class="cx">     for (GCArraySegment&lt;T&gt;* current = m_segments.head(); current-&gt;next(); current = next) {
</span><span class="cx">         next = current-&gt;next();
</span><span class="cx">         m_segments.remove(current);
</span><del>-        m_blockAllocator.deallocate(GCArraySegment&lt;T&gt;::destroy(current));
</del><ins>+        GCArraySegment&lt;T&gt;::destroy(current);
</ins><span class="cx">     }
</span><span class="cx">     m_top = 0;
</span><span class="cx">     m_numberOfSegments = 1;
</span><span class="lines">@@ -75,7 +73,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_segments.head()-&gt;m_top == s_segmentCapacity);
</span><span class="cx">     
</span><del>-    GCArraySegment&lt;T&gt;* nextSegment = GCArraySegment&lt;T&gt;::create(m_blockAllocator.allocate&lt;GCArraySegment&lt;T&gt;&gt;());
</del><ins>+    GCArraySegment&lt;T&gt;* nextSegment = GCArraySegment&lt;T&gt;::create();
</ins><span class="cx">     m_numberOfSegments++;
</span><span class="cx">     
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="lines">@@ -93,7 +91,7 @@
</span><span class="cx">     validatePrevious();
</span><span class="cx">     if (top())
</span><span class="cx">         return true;
</span><del>-    m_blockAllocator.deallocate(GCArraySegment&lt;T&gt;::destroy(m_segments.removeHead()));
</del><ins>+    GCArraySegment&lt;T&gt;::destroy(m_segments.removeHead());
</ins><span class="cx">     ASSERT(m_numberOfSegments &gt; 1);
</span><span class="cx">     m_numberOfSegments--;
</span><span class="cx">     setTopForFullSegment();
</span><span class="lines">@@ -127,12 +125,19 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template &lt;typename T&gt;
</span><del>-inline GCArraySegment&lt;T&gt;* GCArraySegment&lt;T&gt;::create(DeadBlock* block)
</del><ins>+inline GCArraySegment&lt;T&gt;* GCArraySegment&lt;T&gt;::create()
</ins><span class="cx"> {
</span><del>-    return new (NotNull, block) GCArraySegment&lt;T&gt;(block-&gt;region());
</del><ins>+    return new (NotNull, fastMalloc(blockSize)) GCArraySegment&lt;T&gt;();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template &lt;typename T&gt;
</span><ins>+inline void GCArraySegment&lt;T&gt;::destroy(GCArraySegment* segment)
+{
+    segment-&gt;~GCArraySegment();
+    fastFree(segment);
+}
+
+template &lt;typename T&gt;
</ins><span class="cx"> inline size_t GCSegmentedArray&lt;T&gt;::postIncTop()
</span><span class="cx"> {
</span><span class="cx">     size_t result = m_top++;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCThreadSharedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">     : m_vm(vm)
</span><span class="cx">     , m_copiedSpace(&amp;vm-&gt;heap.m_storageSpace)
</span><span class="cx">     , m_shouldHashCons(false)
</span><del>-    , m_sharedMarkStack(vm-&gt;heap.blockAllocator())
</del><ins>+    , m_sharedMarkStack()
</ins><span class="cx">     , m_numberOfActiveParallelMarkers(0)
</span><span class="cx">     , m_parallelMarkersShouldExit(false)
</span><span class="cx">     , m_copyIndex(0)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx">     , m_slotVisitor(m_sharedData)
</span><span class="cx">     , m_copyVisitor(m_sharedData)
</span><span class="cx">     , m_handleSet(vm)
</span><del>-    , m_codeBlocks(m_blockAllocator)
</del><ins>+    , m_codeBlocks()
</ins><span class="cx">     , m_isSafeToCollect(false)
</span><span class="cx">     , m_writeBarrierBuffer(256)
</span><span class="cx">     , m_vm(vm)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkStack.cpp (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkStack.cpp        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/MarkStack.cpp        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><del>-MarkStackArray::MarkStackArray(BlockAllocator&amp; blockAllocator)
-    : GCSegmentedArray&lt;const JSCell*&gt;(blockAllocator)
</del><ins>+MarkStackArray::MarkStackArray()
+    : GCSegmentedArray&lt;const JSCell*&gt;()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkStack.h (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkStack.h        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/MarkStack.h        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> 
</span><span class="cx"> class MarkStackArray : public GCSegmentedArray&lt;const JSCell*&gt; {
</span><span class="cx"> public:
</span><del>-    MarkStackArray(BlockAllocator&amp;);
</del><ins>+    MarkStackArray();
</ins><span class="cx"> 
</span><span class="cx">     void donateSomeCellsTo(MarkStackArray&amp; other);
</span><span class="cx">     void stealSomeCellsFrom(MarkStackArray&amp; other, size_t idleThreadCount);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSlotVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp (179347 => 179348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp        2015-01-29 18:38:51 UTC (rev 179347)
+++ trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp        2015-01-29 19:20:06 UTC (rev 179348)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><span class="cx"> SlotVisitor::SlotVisitor(GCThreadSharedData&amp; shared)
</span><del>-    : m_stack(shared.m_vm-&gt;heap.blockAllocator())
</del><ins>+    : m_stack()
</ins><span class="cx">     , m_bytesVisited(0)
</span><span class="cx">     , m_bytesCopied(0)
</span><span class="cx">     , m_visitCount(0)
</span></span></pre>
</div>
</div>

</body>
</html>