<!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>[202650] trunk</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/202650">202650</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-06-29 15:00:02 -0700 (Wed, 29 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add support for collecting cumulative LLINT stats via a JSC_llintStatsFile option.
https://bugs.webkit.org/show_bug.cgi?id=159274

Reviewed by Keith Miller.

Source/JavaScriptCore:

* jsc.cpp:
(main):
* llint/LLIntData.cpp:
(JSC::LLInt::initialize):
(JSC::LLInt::Data::finalizeStats):
(JSC::LLInt::compareStats):
(JSC::LLInt::Data::dumpStats):
(JSC::LLInt::Data::ensureStats):
(JSC::LLInt::Data::loadStats):
(JSC::LLInt::Data::resetStats):
(JSC::LLInt::Data::saveStats):
* llint/LLIntData.h:
(JSC::LLInt::Data::opcodeStats):
* runtime/Options.cpp:
(JSC::Options::isAvailable):
(JSC::recomputeDependentOptions):
(JSC::Options::initialize):
* runtime/Options.h:

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm:
(DumpRenderTreeMain):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntDatacpp">trunk/Source/JavaScriptCore/llint/LLIntData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntDatah">trunk/Source/JavaScriptCore/llint/LLIntData.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionscpp">trunk/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202649 => 202650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-06-29 21:54:50 UTC (rev 202649)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-06-29 22:00:02 UTC (rev 202650)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-06-29  Mark Lam  &lt;mark.lam@apple.com&gt;
+
+        Add support for collecting cumulative LLINT stats via a JSC_llintStatsFile option.
+        https://bugs.webkit.org/show_bug.cgi?id=159274
+
+        Reviewed by Keith Miller.
+
+        * jsc.cpp:
+        (main):
+        * llint/LLIntData.cpp:
+        (JSC::LLInt::initialize):
+        (JSC::LLInt::Data::finalizeStats):
+        (JSC::LLInt::compareStats):
+        (JSC::LLInt::Data::dumpStats):
+        (JSC::LLInt::Data::ensureStats):
+        (JSC::LLInt::Data::loadStats):
+        (JSC::LLInt::Data::resetStats):
+        (JSC::LLInt::Data::saveStats):
+        * llint/LLIntData.h:
+        (JSC::LLInt::Data::opcodeStats):
+        * runtime/Options.cpp:
+        (JSC::Options::isAvailable):
+        (JSC::recomputeDependentOptions):
+        (JSC::Options::initialize):
+        * runtime/Options.h:
+
</ins><span class="cx"> 2016-06-29  Saam barati  &lt;sbarati@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Destructuring variable declaration is missing a validation of the syntax of a sub production when there is a rhs
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (202649 => 202650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp        2016-06-29 21:54:50 UTC (rev 202649)
+++ trunk/Source/JavaScriptCore/jsc.cpp        2016-06-29 22:00:02 UTC (rev 202650)
</span><span class="lines">@@ -1985,7 +1985,7 @@
</span><span class="cx">     if (Options::logHeapStatisticsAtExit())
</span><span class="cx">         HeapStatistics::reportSuccess();
</span><span class="cx">     if (Options::reportLLIntStats())
</span><del>-        LLInt::Data::dumpStats();
</del><ins>+        LLInt::Data::finalizeStats();
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx">     ecore_shutdown();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntData.cpp (202649 => 202650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntData.cpp        2016-06-29 21:54:50 UTC (rev 202649)
+++ trunk/Source/JavaScriptCore/llint/LLIntData.cpp        2016-06-29 22:00:02 UTC (rev 202650)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include &quot;BytecodeConventions.h&quot;
</span><span class="cx"> #include &quot;CodeBlock.h&quot;
</span><span class="cx"> #include &quot;CodeType.h&quot;
</span><ins>+#include &quot;InitializeThreading.h&quot;
</ins><span class="cx"> #include &quot;Instruction.h&quot;
</span><span class="cx"> #include &quot;JSScope.h&quot;
</span><span class="cx"> #include &quot;LLIntCLoop.h&quot;
</span><span class="lines">@@ -38,6 +39,8 @@
</span><span class="cx"> #include &quot;PropertyOffset.h&quot;
</span><span class="cx"> #include &quot;ShadowChicken.h&quot;
</span><span class="cx"> #include &quot;WriteBarrier.h&quot;
</span><ins>+#include &lt;string&gt;
+#include &lt;wtf/NeverDestroyed.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> #define STATIC_ASSERT(cond) static_assert(cond, &quot;LLInt assumes &quot; #cond)
</span><span class="cx"> 
</span><span class="lines">@@ -67,10 +70,7 @@
</span><span class="cx"> #endif // ENABLE(JIT)
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LLINT_STATS)
</span><del>-    Data::s_opcodeStatsArray = new OpcodeStatsArray();
-    unsigned i = 0;
-    for (auto&amp; stats : *Data::s_opcodeStatsArray)
-        stats.id = static_cast&lt;OpcodeID&gt;(i++);
</del><ins>+    Data::ensureStats();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -228,29 +228,136 @@
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-void Data::dumpStats()
</del><ins>+void Data::finalizeStats()
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(LLINT_STATS)
</span><span class="cx">     if (!Options::reportLLIntStats())
</span><span class="cx">         return;
</span><ins>+    
+    if (Options::llintStatsFile())
+        saveStats();
+    
+    dumpStats();
+#endif
+}
</ins><span class="cx"> 
</span><ins>+#if ENABLE(LLINT_STATS)
+static const bool verboseStats = false;
+
+static bool compareStats(const OpcodeStats&amp; a, const OpcodeStats&amp; b)
+{
+    if (a.count &gt; b.count)
+        return true;
+    if (a.count &lt; b.count)
+        return false;
+    return a.slowPathCount &gt; b.slowPathCount;
+}
+
+void Data::dumpStats()
+{
+    ASSERT(Options::reportLLIntStats());
</ins><span class="cx">     auto statsCopy = *s_opcodeStatsArray;
</span><del>-    std::sort(statsCopy.begin(), statsCopy.end(), [] (OpcodeStats&amp; a, OpcodeStats&amp; b) -&gt; bool {
-        if (a.count &gt; b.count)
-            return true;
-        if (a.count &lt; b.count)
-            return false;
-        return a.slowPathCount &gt; b.slowPathCount;
-    });
-    
</del><ins>+    std::sort(statsCopy.begin(), statsCopy.end(), compareStats);
+
</ins><span class="cx">     dataLog(&quot;Opcode stats:\n&quot;);
</span><span class="cx">     unsigned i = 0;
</span><span class="cx">     for (auto&amp; stats : statsCopy) {
</span><del>-        if (stats.count)
</del><ins>+        if (stats.count || stats.slowPathCount)
</ins><span class="cx">             dataLog(&quot;   [&quot;, i++, &quot;]: fast:&quot;, stats.count, &quot; slow:&quot;, stats.slowPathCount, &quot; &quot;, opcodeNames[stats.id], &quot;\n&quot;);
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void Data::ensureStats()
+{
+    static std::once_flag initializeOptionsOnceFlag;
+    std::call_once(initializeOptionsOnceFlag, [] {
+        s_opcodeStatsArray = new OpcodeStatsArray();
+        resetStats();
+    });
+}
</ins><span class="cx"> 
</span><ins>+void Data::loadStats()
+{
+    static NeverDestroyed&lt;std::string&gt; installedStatsFile;
+    if (!Options::llintStatsFile() || !installedStatsFile.get().compare(Options::llintStatsFile()))
+        return;
+
+    Options::reportLLIntStats() = true; // Force stats collection.
+    installedStatsFile.get() = Options::llintStatsFile();
+
+    ensureStats();
+
+    const char* filename = Options::llintStatsFile();
+    FILE* file = fopen(filename, &quot;r&quot;);
+    if (!file) {
+        dataLogF(&quot;Failed to open file %s. Did you add the file-read-write-data entitlement to WebProcess.sb?\n&quot;, filename);
+        return;
+    }
+
+    resetStats();
+
+    OpcodeStats loaded;
+    unsigned index;
+    char opcodeName[100];
+    while (fscanf(file, &quot;[%u]: fast:%zu slow:%zu id:%u %s\n&quot;, &amp;index, &amp;loaded.count, &amp;loaded.slowPathCount, &amp;loaded.id, opcodeName) != EOF) {
+        if (verboseStats)
+            dataLogF(&quot;loaded [%u]: fast %zu slow %zu id:%u %s\n&quot;, index, loaded.count, loaded.slowPathCount, loaded.id, opcodeName);
+
+        OpcodeStats&amp; stats = opcodeStats(loaded.id);
+        stats.count = loaded.count;
+        stats.slowPathCount = loaded.slowPathCount;
+    }
+
+    if (verboseStats) {
+        dataLogF(&quot;After loading from %s, &quot;, filename);
+        dumpStats();
+    }
+
+    int result = fclose(file);
+    if (result)
+        dataLogF(&quot;Failed to close file %s: %s\n&quot;, filename, strerror(errno));
+}
+
+void Data::resetStats()
+{
+    unsigned i = 0;
+    for (auto&amp; stats : *s_opcodeStatsArray) {
+        stats.id = static_cast&lt;OpcodeID&gt;(i++);
+        stats.count = 0;
+        stats.slowPathCount = 0;
+    }
+}
+
+void Data::saveStats()
+{
+    ASSERT(Options::reportLLIntStats() &amp;&amp; Options::llintStatsFile());
+    const char* filename = Options::llintStatsFile();
+
+    FILE* file = fopen(filename, &quot;w&quot;);
+    if (!file) {
+        dataLogF(&quot;Failed to open file %s. Did you add the file-read-write-data entitlement to WebProcess.sb?\n&quot;, filename);
+        return;
+    }
+
+    auto statsCopy = *s_opcodeStatsArray;
+    std::sort(statsCopy.begin(), statsCopy.end(), compareStats);
+
+    int index = 0;
+    for (auto&amp; stats : statsCopy) {
+        if (!stats.count &amp;&amp; !stats.slowPathCount)
+            break; // stats are sorted. If we encountered 0 counts, then there are no more non-zero counts.
+
+        if (verboseStats)
+            dataLogF(&quot;saved [%u]: fast:%zu slow:%zu id:%u %s\n&quot;, index, stats.count, stats.slowPathCount, stats.id, opcodeNames[stats.id]);
+
+        fprintf(file, &quot;[%u]: fast:%zu slow:%zu id:%u %s\n&quot;, index, stats.count, stats.slowPathCount, stats.id, opcodeNames[stats.id]);
+        index++;
+    }
+
+    int result = fclose(file);
+    if (result)
+        dataLogF(&quot;Failed to close file %s: %s\n&quot;, filename, strerror(errno));
+}
+#endif
+
</ins><span class="cx"> } } // namespace JSC::LLInt
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntData.h (202649 => 202650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntData.h        2016-06-29 21:54:50 UTC (rev 202649)
+++ trunk/Source/JavaScriptCore/llint/LLIntData.h        2016-06-29 22:00:02 UTC (rev 202650)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -56,9 +56,16 @@
</span><span class="cx">     static void performAssertions(VM&amp;);
</span><span class="cx">     static OpcodeStats&amp; opcodeStats(OpcodeID id) { return (*s_opcodeStatsArray)[id]; }
</span><span class="cx"> 
</span><del>-    JS_EXPORT_PRIVATE static void dumpStats();
</del><ins>+    JS_EXPORT_PRIVATE static void finalizeStats();
</ins><span class="cx"> 
</span><ins>+    static void dumpStats();
+    static void loadStats();
+
</ins><span class="cx"> private:
</span><ins>+    static void ensureStats();
+    static void resetStats();
+    static void saveStats();
+
</ins><span class="cx">     static Instruction* s_exceptionInstructions;
</span><span class="cx">     static Opcode s_opcodeMap[numOpcodeIDs];
</span><span class="cx">     static OpcodeStatsArray* s_opcodeStatsArray;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (202649 => 202650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp        2016-06-29 21:54:50 UTC (rev 202649)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp        2016-06-29 22:00:02 UTC (rev 202650)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011-2012, 2014-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011-2012, 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include &quot;Options.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;LLIntCommon.h&quot;
</span><ins>+#include &quot;LLIntData.h&quot;
</ins><span class="cx"> #include &lt;algorithm&gt;
</span><span class="cx"> #include &lt;limits&gt;
</span><span class="cx"> #include &lt;math.h&gt;
</span><span class="lines">@@ -132,7 +133,7 @@
</span><span class="cx">     
</span><span class="cx">     UNUSED_PARAM(id);
</span><span class="cx"> #if ENABLE(LLINT_STATS)
</span><del>-    if (id == reportLLIntStatsID)
</del><ins>+    if (id == reportLLIntStatsID || id == llintStatsFileID)
</ins><span class="cx">         return true;
</span><span class="cx"> #endif
</span><span class="cx">     return false;
</span><span class="lines">@@ -389,6 +390,10 @@
</span><span class="cx">     ASSERT((static_cast&lt;int64_t&gt;(Options::thresholdForOptimizeAfterLongWarmUp()) &lt;&lt; Options::reoptimizationRetryCounterMax()) &gt; 0);
</span><span class="cx">     ASSERT((static_cast&lt;int64_t&gt;(Options::thresholdForOptimizeAfterLongWarmUp()) &lt;&lt; Options::reoptimizationRetryCounterMax()) &lt;= static_cast&lt;int64_t&gt;(std::numeric_limits&lt;int32_t&gt;::max()));
</span><span class="cx">     ASSERT(Options::deferGCProbability() &gt;= 0.0 &amp;&amp; Options::deferGCProbability() &lt;= 1.0);
</span><ins>+
+#if ENABLE(LLINT_STATS)
+    LLInt::Data::loadStats();
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Options::initialize()
</span><span class="lines">@@ -437,8 +442,6 @@
</span><span class="cx">                 ; // Deconfuse editors that do auto indentation
</span><span class="cx"> #endif
</span><span class="cx">     
</span><del>-            recomputeDependentOptions();
-
</del><span class="cx"> #if USE(OPTIONS_FILE)
</span><span class="cx">             {
</span><span class="cx">                 const char* filename = OPTIONS_FILENAME;
</span><span class="lines">@@ -464,6 +467,8 @@
</span><span class="cx">             }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+            recomputeDependentOptions();
+
</ins><span class="cx">             // Do range checks where needed and make corrections to the options:
</span><span class="cx">             ASSERT(Options::thresholdForOptimizeAfterLongWarmUp() &gt;= Options::thresholdForOptimizeAfterWarmUp());
</span><span class="cx">             ASSERT(Options::thresholdForOptimizeAfterWarmUp() &gt;= Options::thresholdForOptimizeSoon());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (202649 => 202650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h        2016-06-29 21:54:50 UTC (rev 202649)
+++ trunk/Source/JavaScriptCore/runtime/Options.h        2016-06-29 22:00:02 UTC (rev 202650)
</span><span class="lines">@@ -375,7 +375,8 @@
</span><span class="cx">     \
</span><span class="cx">     v(bool, useSuperSampler, false, Normal, nullptr) \
</span><span class="cx">     \
</span><del>-    v(bool, reportLLIntStats, false, Configurable, &quot;Reports LLInt statistics&quot;)
</del><ins>+    v(bool, reportLLIntStats, false, Configurable, &quot;Reports LLInt statistics&quot;) \
+    v(optionString, llintStatsFile, nullptr, Configurable, &quot;File to collect LLInt statistics in&quot;) \
</ins><span class="cx"> 
</span><span class="cx"> enum OptionEquivalence {
</span><span class="cx">     SameOption,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202649 => 202650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-06-29 21:54:50 UTC (rev 202649)
+++ trunk/Tools/ChangeLog        2016-06-29 22:00:02 UTC (rev 202650)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-29  Mark Lam  &lt;mark.lam@apple.com&gt;
+
+        Add support for collecting cumulative LLINT stats via a JSC_llintStatsFile option.
+        https://bugs.webkit.org/show_bug.cgi?id=159274
+
+        Reviewed by Keith Miller.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (DumpRenderTreeMain):
+
</ins><span class="cx"> 2016-06-29  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         WKWebView should ask WKNavigationDelegate about bad ssl certificates
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (202649 => 202650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2016-06-29 21:54:50 UTC (rev 202649)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2016-06-29 22:00:02 UTC (rev 202650)
</span><span class="lines">@@ -1444,7 +1444,7 @@
</span><span class="cx">     if (JSC::Options::logHeapStatisticsAtExit())
</span><span class="cx">         JSC::HeapStatistics::reportSuccess();
</span><span class="cx">     if (JSC::Options::reportLLIntStats())
</span><del>-        JSC::LLInt::Data::dumpStats();
</del><ins>+        JSC::LLInt::Data::finalizeStats();
</ins><span class="cx">     [pool release];
</span><span class="cx">     returningFromMain = true;
</span><span class="cx">     return 0;
</span></span></pre>
</div>
</div>

</body>
</html>