<!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>[165938] 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/165938">165938</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-19 18:49:03 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix JavaScriptCore ChangeLog</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCommonh">trunk/Source/JavaScriptCore/dfg/DFGCommon.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165937 => 165938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-20 01:05:37 UTC (rev 165937)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-20 01:49:03 UTC (rev 165938)
</span><span class="lines">@@ -57,89 +57,6 @@
</span><span class="cx"> * heap/HeapTimer.cpp:
</span><span class="cx"> (JSC::HeapTimer::timerDidFire):
</span><span class="cx">
</span><del>-<<<<<<< .mine
-2014-03-18 Mark Hahnenberg <mhahnenberg@apple.com>
-
- GC timer should intelligently choose between EdenCollections and FullCollections
- https://bugs.webkit.org/show_bug.cgi?id=128261
-
- Reviewed by Geoffrey Garen.
-
- Most of the GCs while browsing the web are due to the GC timer. Currently the GC timer
- always does FullCollections. To reduce the impact of the GC timer on the system this patch
- changes Heap so that it has two timers, one for each type of collection. The FullCollection
- timer is notified at the end of EdenCollections how much the Heap has grown since the last
- FullCollection and when somebody notifies the Heap of abandoned memory (which usually wouldn't
- be detected by an EdenCollection).
-
- * CMakeLists.txt:
- * GNUmakefile.list.am:
- * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
- * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
- * JavaScriptCore.xcodeproj/project.pbxproj:
- * heap/EdenGCActivityCallback.cpp: Added.
- (JSC::EdenGCActivityCallback::EdenGCActivityCallback):
- (JSC::EdenGCActivityCallback::doCollection):
- (JSC::EdenGCActivityCallback::lastGCLength):
- (JSC::EdenGCActivityCallback::deathRate):
- (JSC::EdenGCActivityCallback::gcTimeSlice):
- * heap/EdenGCActivityCallback.h: Added.
- (JSC::EdenGCActivityCallback::EdenGCActivityCallback):
- (JSC::GCActivityCallback::createEdenTimer):
- * heap/FullGCActivityCallback.cpp: Added.
- (JSC::FullGCActivityCallback::FullGCActivityCallback):
- (JSC::FullGCActivityCallback::doCollection):
- (JSC::FullGCActivityCallback::lastGCLength):
- (JSC::FullGCActivityCallback::deathRate):
- (JSC::FullGCActivityCallback::gcTimeSlice):
- * heap/FullGCActivityCallback.h: Added.
- (JSC::FullGCActivityCallback::FullGCActivityCallback):
- (JSC::GCActivityCallback::createFullTimer):
- * heap/GCActivityCallback.cpp:
- (JSC::GCActivityCallback::GCActivityCallback):
- (JSC::GCActivityCallback::doWork):
- (JSC::GCActivityCallback::scheduleTimer):
- (JSC::GCActivityCallback::cancelTimer):
- (JSC::GCActivityCallback::didAllocate):
- (JSC::GCActivityCallback::willCollect):
- (JSC::GCActivityCallback::cancel):
- * heap/GCActivityCallback.h:
- (JSC::GCActivityCallback::GCActivityCallback):
- * heap/Heap.cpp:
- (JSC::Heap::Heap):
- (JSC::Heap::reportAbandonedObjectGraph):
- (JSC::Heap::didAbandon):
- (JSC::Heap::collectAllGarbage):
- (JSC::Heap::collect):
- (JSC::Heap::willStartCollection):
- (JSC::Heap::updateAllocationLimits):
- (JSC::Heap::didFinishCollection):
- (JSC::Heap::setFullActivityCallback):
- (JSC::Heap::setEdenActivityCallback):
- (JSC::Heap::fullActivityCallback):
- (JSC::Heap::edenActivityCallback):
- (JSC::Heap::setGarbageCollectionTimerEnabled):
- (JSC::Heap::didAllocate):
- (JSC::Heap::shouldDoFullCollection):
- * heap/Heap.h:
- (JSC::Heap::lastFullGCLength):
- (JSC::Heap::lastEdenGCLength):
- (JSC::Heap::increaseLastFullGCLength):
- (JSC::Heap::sizeBeforeLastEdenCollection):
- (JSC::Heap::sizeAfterLastEdenCollection):
- (JSC::Heap::sizeBeforeLastFullCollection):
- (JSC::Heap::sizeAfterLastFullCollection):
- * heap/HeapOperation.h:
- * heap/HeapStatistics.cpp:
- (JSC::HeapStatistics::showObjectStatistics):
- * heap/HeapTimer.cpp:
- (JSC::HeapTimer::timerDidFire):
- * jsc.cpp:
- (functionFullGC):
- (functionEdenGC):
- * runtime/Options.h:
-
-=======
</del><span class="cx"> 2014-03-19 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r165459): It broke 109 jsc stress test on ARM Thumb2 and Mac 32 bit
</span><span class="lines">@@ -178,7 +95,6 @@
</span><span class="cx"> * runtime/JSStringJoiner.cpp:
</span><span class="cx"> (JSC::JSStringJoiner::join):
</span><span class="cx">
</span><del>->>>>>>> .r165925
</del><span class="cx"> 2014-03-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of Flush in SSA
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCommonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCommon.h (165937 => 165938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCommon.h 2014-03-20 01:05:37 UTC (rev 165937)
+++ trunk/Source/JavaScriptCore/dfg/DFGCommon.h 2014-03-20 01:49:03 UTC (rev 165938)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> // Describes the form you can expect the entire graph to be in.
</span><span class="cx"> enum GraphForm {
</span><span class="cx"> // LoadStore form means that basic blocks may freely use GetLocal, SetLocal,
</span><del>- // GetLocalUnlinked, and Flush for accessing local variables and indicating
</del><ins>+ // and GetLocalUnlinked for accessing local variables and indicating
</ins><span class="cx"> // where their live ranges ought to be. Data flow between local accesses is
</span><span class="cx"> // implicit. Liveness is only explicit at block heads (variablesAtHead).
</span><span class="cx"> // This is only used by the DFG simplifier and is only preserved by same.
</span></span></pre>
</div>
</div>
</body>
</html>