<!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>[214543] branches/safari-603-branch/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/214543">214543</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 10:22:48 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/212310">r212310</a> via <a href="http://trac.webkit.org/projects/webkit/changeset/214519">r214519</a>. rdar://problem/30922106</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreheapHeapcpp">branches/safari-603-branch/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreheapHeaph">branches/safari-603-branch/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeOptionscpp">branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeOptionsh">branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (214542 => 214543)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-03-29 17:22:02 UTC (rev 214542)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-03-29 17:22:48 UTC (rev 214543)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2017-03-29 Jason Marcell <jmarcell@apple.com>
+
+ Rollout r214519. rdar://problem/30922106
+
</ins><span class="cx"> 2017-03-28 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r214240. rdar://problem/31178794
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/heap/Heap.cpp (214542 => 214543)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/heap/Heap.cpp 2017-03-29 17:22:02 UTC (rev 214542)
+++ branches/safari-603-branch/Source/JavaScriptCore/heap/Heap.cpp 2017-03-29 17:22:48 UTC (rev 214543)
</span><span class="lines">@@ -1019,21 +1019,6 @@
</span><span class="cx"> m_mutatorMarkStack->append(cell);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::sweepSynchronously()
-{
- double before = 0;
- if (Options::logGC()) {
- dataLog("[Full sweep: ", capacity() / 1024, "kb ");
- before = currentTimeMS();
- }
- m_objectSpace.sweep();
- m_objectSpace.shrink();
- if (Options::logGC()) {
- double after = currentTimeMS();
- dataLog("=> ", capacity() / 1024, "kb, ", after - before, "ms] ");
- }
-}
-
</del><span class="cx"> void Heap::collectAllGarbage()
</span><span class="cx"> {
</span><span class="cx"> if (!m_isSafeToCollect)
</span><span class="lines">@@ -1044,12 +1029,18 @@
</span><span class="cx"> DeferGCForAWhile deferGC(*this);
</span><span class="cx"> if (UNLIKELY(Options::useImmortalObjects()))
</span><span class="cx"> sweeper()->willFinishSweeping();
</span><del>-
- bool alreadySweptInCollectSync = Options::sweepSynchronously();
- if (!alreadySweptInCollectSync) {
- sweepSynchronously();
- if (Options::logGC())
- dataLog("\n");
</del><ins>+ else {
+ double before = 0;
+ if (Options::logGC()) {
+ dataLog("[Full sweep: ", capacity() / 1024, "kb ");
+ before = currentTimeMS();
+ }
+ m_objectSpace.sweep();
+ m_objectSpace.shrink();
+ if (Options::logGC()) {
+ double after = currentTimeMS();
+ dataLog("=> ", capacity() / 1024, "kb, ", after - before, "ms]\n");
+ }
</ins><span class="cx"> }
</span><span class="cx"> m_objectSpace.assertNoUnswept();
</span><span class="cx">
</span><span class="lines">@@ -1588,9 +1579,6 @@
</span><span class="cx">
</span><span class="cx"> if (HasOwnPropertyCache* cache = vm()->hasOwnPropertyCache())
</span><span class="cx"> cache->clear();
</span><del>-
- if (Options::sweepSynchronously())
- sweepSynchronously();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Heap::Ticket Heap::requestCollection(std::optional<CollectionScope> scope)
</span><span class="lines">@@ -1819,6 +1807,9 @@
</span><span class="cx"> if (Options::recordGCPauseTimes())
</span><span class="cx"> HeapStatistics::recordGCPauseTime(gcStartTime, gcEndTime);
</span><span class="cx">
</span><ins>+ if (Options::useZombieMode())
+ zombifyDeadObjects();
+
</ins><span class="cx"> if (Options::dumpObjectStatistics())
</span><span class="cx"> HeapStatistics::dumpObjectStatistics(this);
</span><span class="cx">
</span><span class="lines">@@ -1919,6 +1910,36 @@
</span><span class="cx"> collectAllGarbage();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class Zombify : public MarkedBlock::VoidFunctor {
+public:
+ inline void visit(HeapCell* cell) const
+ {
+ void** current = reinterpret_cast_ptr<void**>(cell);
+
+ // We want to maintain zapped-ness because that's how we know if we've called
+ // the destructor.
+ if (cell->isZapped())
+ current++;
+
+ void* limit = static_cast<void*>(reinterpret_cast<char*>(cell) + cell->cellSize());
+ for (; current < limit; current++)
+ *current = zombifiedBits;
+ }
+ IterationStatus operator()(HeapCell* cell, HeapCell::Kind) const
+ {
+ visit(cell);
+ return IterationStatus::Continue;
+ }
+};
+
+void Heap::zombifyDeadObjects()
+{
+ // Sweep now because destructors will crash once we're zombified.
+ m_objectSpace.sweep();
+ HeapIterationScope iterationScope(*this);
+ m_objectSpace.forEachDeadCell(iterationScope, Zombify());
+}
+
</ins><span class="cx"> bool Heap::shouldDoFullCollection(std::optional<CollectionScope> scope) const
</span><span class="cx"> {
</span><span class="cx"> if (!Options::useGenerationalGC())
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/heap/Heap.h (214542 => 214543)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/heap/Heap.h 2017-03-29 17:22:02 UTC (rev 214542)
+++ branches/safari-603-branch/Source/JavaScriptCore/heap/Heap.h 2017-03-29 17:22:48 UTC (rev 214543)
</span><span class="lines">@@ -85,6 +85,8 @@
</span><span class="cx"> class Worklist;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void* const zombifiedBits = reinterpret_cast<void*>(static_cast<uintptr_t>(0xdeadbeef));
+
</ins><span class="cx"> typedef HashCountedSet<JSCell*> ProtectCountSet;
</span><span class="cx"> typedef HashCountedSet<const char*> TypeCountSet;
</span><span class="cx">
</span><span class="lines">@@ -165,7 +167,6 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void collectAllGarbageIfNotDoneRecently();
</span><span class="cx"> JS_EXPORT_PRIVATE void collectAllGarbage();
</span><del>- JS_EXPORT_PRIVATE void sweepSynchronously();
</del><span class="cx">
</span><span class="cx"> bool shouldCollectHeuristic();
</span><span class="cx">
</span><span class="lines">@@ -258,6 +259,8 @@
</span><span class="cx"> template<typename T> void releaseSoon(RetainPtr<T>&&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ static bool isZombified(JSCell* cell) { return *(void**)cell == zombifiedBits; }
+
</ins><span class="cx"> JS_EXPORT_PRIVATE void registerWeakGCMap(void* weakGCMap, std::function<void()> pruningCallback);
</span><span class="cx"> JS_EXPORT_PRIVATE void unregisterWeakGCMap(void* weakGCMap);
</span><span class="cx">
</span><span class="lines">@@ -445,6 +448,7 @@
</span><span class="cx"> void updateAllocationLimits();
</span><span class="cx"> void didFinishCollection(double gcStartTime);
</span><span class="cx"> void resumeCompilerThreads();
</span><ins>+ void zombifyDeadObjects();
</ins><span class="cx"> void gatherExtraHeapSnapshotData(HeapProfiler&);
</span><span class="cx"> void removeDeadHeapSnapshotNodes(HeapProfiler&);
</span><span class="cx"> void finalize();
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.cpp (214542 => 214543)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.cpp 2017-03-29 17:22:02 UTC (rev 214542)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.cpp 2017-03-29 17:22:48 UTC (rev 214543)
</span><span class="lines">@@ -446,12 +446,6 @@
</span><span class="cx"> else
</span><span class="cx"> fastSetMaxSingleAllocationSize(std::numeric_limits<size_t>::max());
</span><span class="cx"> #endif
</span><del>-
- if (Options::useZombieMode()) {
- Options::sweepSynchronously() = true;
- Options::scribbleFreeCells() = true;
- }
-
</del><span class="cx"> if (Options::useSigillCrashAnalyzer())
</span><span class="cx"> enableSigillCrashAnalyzer();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.h (214542 => 214543)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.h 2017-03-29 17:22:02 UTC (rev 214542)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/Options.h 2017-03-29 17:22:48 UTC (rev 214543)
</span><span class="lines">@@ -339,9 +339,8 @@
</span><span class="cx"> v(bool, forceWeakRandomSeed, false, Normal, nullptr) \
</span><span class="cx"> v(unsigned, forcedWeakRandomSeed, 0, Normal, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, useZombieMode, false, Normal, "debugging option to scribble over dead objects with 0xbadbeef0") \
</del><ins>+ v(bool, useZombieMode, false, Normal, "debugging option to scribble over dead objects with 0xdeadbeef") \
</ins><span class="cx"> v(bool, useImmortalObjects, false, Normal, "debugging option to keep all objects alive forever") \
</span><del>- v(bool, sweepSynchronously, false, Normal, "debugging option to sweep all dead objects synchronously at GC end before resuming mutator") \
</del><span class="cx"> v(bool, dumpObjectStatistics, false, Normal, nullptr) \
</span><span class="cx"> v(unsigned, maxSingleAllocationSize, 0, Configurable, "debugging option to limit individual allocations to a max size (0 = limit not set, N = limit size in bytes)") \
</span><span class="cx"> \
</span></span></pre>
</div>
</div>
</body>
</html>