<!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>[207055] releases/WebKitGTK/webkit-2.14/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/207055">207055</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-10 23:53:03 -0700 (Mon, 10 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205658">r205658</a> - Heap version should be 32-bit
https://bugs.webkit.org/show_bug.cgi?id=161751
Reviewed by Mark Lam.
32-bit devices are probably getting hurt by the 64-bit version number. The reason why I made
it 64-bit initially is so that I wouldn't have to worry about wrap-around. But wrap-around is
easy to handle.
* heap/CellContainer.h:
* heap/CellContainerInlines.h:
(JSC::CellContainer::flipIfNecessary):
* heap/ConservativeRoots.cpp:
(JSC::ConservativeRoots::genericAddPointer):
(JSC::ConservativeRoots::genericAddSpan):
* heap/ConservativeRoots.h:
* heap/Heap.h:
* heap/HeapInlines.h:
(JSC::Heap::testAndSetMarked):
* heap/HeapUtil.h:
(JSC::HeapUtil::findGCObjectPointersForMarking):
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::MarkedBlock):
* heap/MarkedBlock.h:
(JSC::MarkedBlock::flipIfNecessary):
(JSC::MarkedBlock::flipIfNecessaryConcurrently):
(JSC::MarkedBlock::Handle::flipIfNecessary):
(JSC::MarkedBlock::Handle::flipIfNecessaryConcurrently):
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::flip):
* heap/MarkedSpace.h:
(JSC::MarkedSpace::version):
* heap/SlotVisitor.cpp:
(JSC::SlotVisitor::SlotVisitor):
* heap/SlotVisitor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapCellContainerh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/CellContainer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapCellContainerInlinesh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/CellContainerInlines.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapConservativeRootscpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/ConservativeRoots.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapConservativeRootsh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/ConservativeRoots.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeaph">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeapInlinesh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapInlines.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeapUtilh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapUtil.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedBlockcpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedBlockh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedSpacecpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedSpace.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedSpaceh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedSpace.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapSlotVisitorcpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/SlotVisitor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapSlotVisitorh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/SlotVisitor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-09-08 Filip Pizlo <fpizlo@apple.com>
+
+ Heap version should be 32-bit
+ https://bugs.webkit.org/show_bug.cgi?id=161751
+
+ Reviewed by Mark Lam.
+
+ 32-bit devices are probably getting hurt by the 64-bit version number. The reason why I made
+ it 64-bit initially is so that I wouldn't have to worry about wrap-around. But wrap-around is
+ easy to handle.
+
+ * heap/CellContainer.h:
+ * heap/CellContainerInlines.h:
+ (JSC::CellContainer::flipIfNecessary):
+ * heap/ConservativeRoots.cpp:
+ (JSC::ConservativeRoots::genericAddPointer):
+ (JSC::ConservativeRoots::genericAddSpan):
+ * heap/ConservativeRoots.h:
+ * heap/Heap.h:
+ * heap/HeapInlines.h:
+ (JSC::Heap::testAndSetMarked):
+ * heap/HeapUtil.h:
+ (JSC::HeapUtil::findGCObjectPointersForMarking):
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::MarkedBlock):
+ * heap/MarkedBlock.h:
+ (JSC::MarkedBlock::flipIfNecessary):
+ (JSC::MarkedBlock::flipIfNecessaryConcurrently):
+ (JSC::MarkedBlock::Handle::flipIfNecessary):
+ (JSC::MarkedBlock::Handle::flipIfNecessaryConcurrently):
+ * heap/MarkedSpace.cpp:
+ (JSC::MarkedSpace::flip):
+ * heap/MarkedSpace.h:
+ (JSC::MarkedSpace::version):
+ * heap/SlotVisitor.cpp:
+ (JSC::SlotVisitor::SlotVisitor):
+ * heap/SlotVisitor.h:
+
</ins><span class="cx"> 2016-09-08 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for a ternary sub32 emitter for ARM64 and 32-bit ARM.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapCellContainerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/CellContainer.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/CellContainer.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/CellContainer.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> class MarkedBlock;
</span><span class="cx"> class WeakSet;
</span><span class="cx">
</span><ins>+typedef uint32_t HeapVersion;
+
</ins><span class="cx"> // This is how we abstract over either MarkedBlock& or LargeAllocation&. Put things in here as you
</span><span class="cx"> // find need for them.
</span><span class="cx">
</span><span class="lines">@@ -71,7 +73,7 @@
</span><span class="cx"> return *bitwise_cast<LargeAllocation*>(m_encodedPointer - isLargeAllocationBit);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void flipIfNecessary(uint64_t heapVersion);
</del><ins>+ void flipIfNecessary(HeapVersion);
</ins><span class="cx"> void flipIfNecessary();
</span><span class="cx">
</span><span class="cx"> bool isMarked() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapCellContainerInlinesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/CellContainerInlines.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/CellContainerInlines.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/CellContainerInlines.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return markedBlock().weakSet();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void CellContainer::flipIfNecessary(uint64_t heapVersion)
</del><ins>+inline void CellContainer::flipIfNecessary(HeapVersion heapVersion)
</ins><span class="cx"> {
</span><span class="cx"> if (!isLargeAllocation())
</span><span class="cx"> markedBlock().flipIfNecessary(heapVersion);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapConservativeRootscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/ConservativeRoots.cpp (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename MarkHook>
</span><del>-inline void ConservativeRoots::genericAddPointer(void* p, int64_t version, TinyBloomFilter filter, MarkHook& markHook)
</del><ins>+inline void ConservativeRoots::genericAddPointer(void* p, HeapVersion version, TinyBloomFilter filter, MarkHook& markHook)
</ins><span class="cx"> {
</span><span class="cx"> markHook.mark(p);
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> RELEASE_ASSERT(isPointerAligned(end));
</span><span class="cx">
</span><span class="cx"> TinyBloomFilter filter = m_heap.objectSpace().blocks().filter(); // Make a local copy of filter to show the compiler it won't alias, and can be register-allocated.
</span><del>- int64_t version = m_heap.objectSpace().version();
</del><ins>+ HeapVersion version = m_heap.objectSpace().version();
</ins><span class="cx"> for (char** it = static_cast<char**>(begin); it != static_cast<char**>(end); ++it)
</span><span class="cx"> genericAddPointer(*it, version, filter, markHook);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapConservativeRootsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/ConservativeRoots.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/ConservativeRoots.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/ConservativeRoots.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> static const size_t nonInlineCapacity = 8192 / sizeof(HeapCell*);
</span><span class="cx">
</span><span class="cx"> template<typename MarkHook>
</span><del>- void genericAddPointer(void*, int64_t heapVersion, TinyBloomFilter, MarkHook&);
</del><ins>+ void genericAddPointer(void*, HeapVersion, TinyBloomFilter, MarkHook&);
</ins><span class="cx">
</span><span class="cx"> template<typename MarkHook>
</span><span class="cx"> void genericAddSpan(void*, void* end, MarkHook&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> static bool isLive(const void*);
</span><span class="cx"> static bool isMarked(const void*);
</span><del>- static bool testAndSetMarked(int64_t, const void*);
</del><ins>+ static bool testAndSetMarked(HeapVersion, const void*);
</ins><span class="cx"> static void setMarked(const void*);
</span><span class="cx">
</span><span class="cx"> static size_t cellSize(const void*);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeapInlinesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapInlines.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapInlines.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapInlines.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> return block.isMarked(cell);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE bool Heap::testAndSetMarked(int64_t version, const void* rawCell)
</del><ins>+ALWAYS_INLINE bool Heap::testAndSetMarked(HeapVersion version, const void* rawCell)
</ins><span class="cx"> {
</span><span class="cx"> HeapCell* cell = bitwise_cast<HeapCell*>(rawCell);
</span><span class="cx"> if (cell->isLargeAllocation())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeapUtilh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapUtil.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapUtil.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapUtil.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> // before liveness data is cleared to be accurate.
</span><span class="cx"> template<typename Func>
</span><span class="cx"> static void findGCObjectPointersForMarking(
</span><del>- Heap& heap, int64_t heapVersion, TinyBloomFilter filter, void* passedPointer,
</del><ins>+ Heap& heap, HeapVersion heapVersion, TinyBloomFilter filter, void* passedPointer,
</ins><span class="cx"> const Func& func)
</span><span class="cx"> {
</span><span class="cx"> const HashSet<MarkedBlock*>& set = heap.objectSpace().blocks().set();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedBlockcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -85,9 +85,9 @@
</span><span class="cx">
</span><span class="cx"> MarkedBlock::MarkedBlock(VM& vm, Handle& handle)
</span><span class="cx"> : m_needsDestruction(handle.needsDestruction())
</span><ins>+ , m_version(vm.heap.objectSpace().version())
</ins><span class="cx"> , m_handle(handle)
</span><span class="cx"> , m_vm(&vm)
</span><del>- , m_version(vm.heap.objectSpace().version())
</del><span class="cx"> {
</span><span class="cx"> unsigned cellsPerBlock = MarkedSpace::blockPayload / handle.cellSize();
</span><span class="cx"> double markCountBias = -(Options::minMarkedBlockUtilization() * cellsPerBlock);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedBlockh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> class MarkedAllocator;
</span><span class="cx">
</span><span class="cx"> typedef uintptr_t Bits;
</span><ins>+typedef uint32_t HeapVersion;
</ins><span class="cx">
</span><span class="cx"> // Set to log state transitions of blocks.
</span><span class="cx"> #define HEAP_LOG_BLOCK_STATE_TRANSITIONS 0
</span><span class="lines">@@ -185,8 +186,8 @@
</span><span class="cx">
</span><span class="cx"> bool needsFlip();
</span><span class="cx">
</span><del>- void flipIfNecessaryConcurrently(uint64_t heapVersion);
- void flipIfNecessary(uint64_t heapVersion);
</del><ins>+ void flipIfNecessaryConcurrently(HeapVersion);
+ void flipIfNecessary(HeapVersion);
</ins><span class="cx"> void flipIfNecessary();
</span><span class="cx">
</span><span class="cx"> void assertFlipped();
</span><span class="lines">@@ -265,8 +266,8 @@
</span><span class="cx">
</span><span class="cx"> bool needsFlip();
</span><span class="cx">
</span><del>- void flipIfNecessaryConcurrently(uint64_t heapVersion);
- void flipIfNecessary(uint64_t heapVersion);
</del><ins>+ void flipIfNecessaryConcurrently(HeapVersion);
+ void flipIfNecessary(HeapVersion);
</ins><span class="cx"> void flipIfNecessary();
</span><span class="cx">
</span><span class="cx"> void assertFlipped();
</span><span class="lines">@@ -319,11 +320,11 @@
</span><span class="cx"> //
</span><span class="cx"> // m_biasedMarkCount != m_markCountBias
</span><span class="cx"> int16_t m_markCountBias;
</span><ins>+
+ HeapVersion m_version;
</ins><span class="cx">
</span><span class="cx"> Handle& m_handle;
</span><span class="cx"> VM* m_vm;
</span><del>-
- uint64_t m_version;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline MarkedBlock::Handle& MarkedBlock::handle()
</span><span class="lines">@@ -461,13 +462,13 @@
</span><span class="cx"> return (reinterpret_cast<Bits>(p) - reinterpret_cast<Bits>(this)) / atomSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void MarkedBlock::flipIfNecessary(uint64_t heapVersion)
</del><ins>+inline void MarkedBlock::flipIfNecessary(HeapVersion heapVersion)
</ins><span class="cx"> {
</span><span class="cx"> if (UNLIKELY(heapVersion != m_version))
</span><span class="cx"> flipIfNecessarySlow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void MarkedBlock::flipIfNecessaryConcurrently(uint64_t heapVersion)
</del><ins>+inline void MarkedBlock::flipIfNecessaryConcurrently(HeapVersion heapVersion)
</ins><span class="cx"> {
</span><span class="cx"> if (UNLIKELY(heapVersion != m_version))
</span><span class="cx"> flipIfNecessaryConcurrentlySlow();
</span><span class="lines">@@ -474,12 +475,12 @@
</span><span class="cx"> WTF::loadLoadFence();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void MarkedBlock::Handle::flipIfNecessary(uint64_t heapVersion)
</del><ins>+inline void MarkedBlock::Handle::flipIfNecessary(HeapVersion heapVersion)
</ins><span class="cx"> {
</span><span class="cx"> block().flipIfNecessary(heapVersion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void MarkedBlock::Handle::flipIfNecessaryConcurrently(uint64_t heapVersion)
</del><ins>+inline void MarkedBlock::Handle::flipIfNecessaryConcurrently(HeapVersion heapVersion)
</ins><span class="cx"> {
</span><span class="cx"> block().flipIfNecessaryConcurrently(heapVersion);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedSpacecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedSpace.cpp (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedSpace.cpp 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedSpace.cpp 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -462,7 +462,16 @@
</span><span class="cx"> for (unsigned i = 0; i < m_blocksWithNewObjects.size(); ++i)
</span><span class="cx"> m_blocksWithNewObjects[i]->flipForEdenCollection();
</span><span class="cx"> } else {
</span><del>- m_version++; // Henceforth, flipIfNecessary() will trigger on all blocks.
</del><ins>+ HeapVersion nextVersion = m_version + 1;
+ if (UNLIKELY(nextVersion == initialVersion)) {
+ // Oh no! Version wrap-around! We handle this by flipping all blocks. This happens
+ // super rarely, probably never for most users.
+ forEachBlock(
+ [&] (MarkedBlock::Handle* handle) {
+ handle->flipIfNecessary();
+ });
+ }
+ m_version = nextVersion; // Henceforth, flipIfNecessary() will trigger on all blocks.
</ins><span class="cx"> for (LargeAllocation* allocation : m_largeAllocations)
</span><span class="cx"> allocation->flip();
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedSpaceh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedSpace.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedSpace.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedSpace.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> class LLIntOffsetsExtractor;
</span><span class="cx"> class WeakSet;
</span><span class="cx">
</span><ins>+typedef uint32_t HeapVersion;
+
</ins><span class="cx"> class MarkedSpace {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(MarkedSpace);
</span><span class="cx"> public:
</span><span class="lines">@@ -63,6 +65,8 @@
</span><span class="cx">
</span><span class="cx"> static const size_t numSizeClasses = largeCutoff / sizeStep;
</span><span class="cx">
</span><ins>+ static const HeapVersion initialVersion = 42; // This can be any value, including random garbage, so long as it's consistent for the lifetime of the process.
+
</ins><span class="cx"> static size_t sizeClassToIndex(size_t size)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(size);
</span><span class="lines">@@ -151,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> bool isPagedOut(double deadline);
</span><span class="cx">
</span><del>- uint64_t version() const { return m_version; }
</del><ins>+ HeapVersion version() const { return m_version; }
</ins><span class="cx">
</span><span class="cx"> const Vector<MarkedBlock::Handle*>& blocksWithNewObjects() const { return m_blocksWithNewObjects; }
</span><span class="cx">
</span><span class="lines">@@ -189,7 +193,7 @@
</span><span class="cx"> Subspace m_auxiliarySpace;
</span><span class="cx">
</span><span class="cx"> Heap* m_heap;
</span><del>- uint64_t m_version { 42 }; // This can start at any value, including random garbage values.
</del><ins>+ HeapVersion m_version { initialVersion };
</ins><span class="cx"> size_t m_capacity;
</span><span class="cx"> bool m_isIterating;
</span><span class="cx"> MarkedBlockSet m_blocks;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapSlotVisitorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/SlotVisitor.cpp (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/SlotVisitor.cpp 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/SlotVisitor.cpp 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> , m_bytesCopied(0)
</span><span class="cx"> , m_visitCount(0)
</span><span class="cx"> , m_isInParallelMode(false)
</span><del>- , m_version(42)
</del><ins>+ , m_version(MarkedSpace::initialVersion)
</ins><span class="cx"> , m_heap(heap)
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> , m_isCheckingForDefaultMarkViolation(false)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapSlotVisitorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/SlotVisitor.h (207054 => 207055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/SlotVisitor.h 2016-10-11 06:43:35 UTC (rev 207054)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/SlotVisitor.h 2016-10-11 06:53:03 UTC (rev 207055)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx"> class WeakReferenceHarvester;
</span><span class="cx"> template<typename T> class WriteBarrierBase;
</span><span class="cx">
</span><ins>+typedef uint32_t HeapVersion;
+
</ins><span class="cx"> class SlotVisitor {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SlotVisitor);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -160,7 +162,7 @@
</span><span class="cx"> size_t m_visitCount;
</span><span class="cx"> bool m_isInParallelMode;
</span><span class="cx">
</span><del>- uint64_t m_version;
</del><ins>+ HeapVersion m_version;
</ins><span class="cx">
</span><span class="cx"> Heap& m_heap;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>