<!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>[180740] releases/WebKitGTK/webkit-2.8/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/180740">180740</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-27 04:13:01 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/180257">r180257</a> - Clean up OSRExit's considerAddingAsFrequentExitSite()
https://bugs.webkit.org/show_bug.cgi?id=141690
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-02-17
Reviewed by Anders Carlsson.
Looks like some code was removed from CodeBlock::tallyFrequentExitSites()
and the OSRExit were left untouched.
This patch cleans up the two loops and remove the boolean return
on considerAddingAsFrequentExitSite().
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::tallyFrequentExitSites):
* dfg/DFGOSRExit.h:
(JSC::DFG::OSRExit::considerAddingAsFrequentExitSite):
* dfg/DFGOSRExitBase.cpp:
(JSC::DFG::OSRExitBase::considerAddingAsFrequentExitSiteSlow):
* dfg/DFGOSRExitBase.h:
(JSC::DFG::OSRExitBase::considerAddingAsFrequentExitSite):
* ftl/FTLOSRExit.h:
(JSC::FTL::OSRExit::considerAddingAsFrequentExitSite):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCorebytecodeCodeBlockcpp">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoredfgDFGOSRExith">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExit.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoredfgDFGOSRExitBasecpp">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExitBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoredfgDFGOSRExitBaseh">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExitBase.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreftlFTLOSRExith">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ftl/FTLOSRExit.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog (180739 => 180740)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-02-27 12:09:34 UTC (rev 180739)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-02-27 12:13:01 UTC (rev 180740)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-02-17 Benjamin Poulain <bpoulain@apple.com>
+
+ Clean up OSRExit's considerAddingAsFrequentExitSite()
+ https://bugs.webkit.org/show_bug.cgi?id=141690
+
+ Reviewed by Anders Carlsson.
+
+ Looks like some code was removed from CodeBlock::tallyFrequentExitSites()
+ and the OSRExit were left untouched.
+
+ This patch cleans up the two loops and remove the boolean return
+ on considerAddingAsFrequentExitSite().
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::tallyFrequentExitSites):
+ * dfg/DFGOSRExit.h:
+ (JSC::DFG::OSRExit::considerAddingAsFrequentExitSite):
+ * dfg/DFGOSRExitBase.cpp:
+ (JSC::DFG::OSRExitBase::considerAddingAsFrequentExitSiteSlow):
+ * dfg/DFGOSRExitBase.h:
+ (JSC::DFG::OSRExitBase::considerAddingAsFrequentExitSite):
+ * ftl/FTLOSRExit.h:
+ (JSC::FTL::OSRExit::considerAddingAsFrequentExitSite):
+
</ins><span class="cx"> 2015-02-17 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, Restoring the C LOOP insta-crash fix in r180184.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/bytecode/CodeBlock.cpp (180739 => 180740)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-02-27 12:09:34 UTC (rev 180739)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-02-27 12:13:01 UTC (rev 180740)
</span><span class="lines">@@ -3730,9 +3730,7 @@
</span><span class="cx"> DFG::JITCode* jitCode = m_jitCode->dfg();
</span><span class="cx"> for (unsigned i = 0; i < jitCode->osrExit.size(); ++i) {
</span><span class="cx"> DFG::OSRExit& exit = jitCode->osrExit[i];
</span><del>-
- if (!exit.considerAddingAsFrequentExitSite(profiledBlock))
- continue;
</del><ins>+ exit.considerAddingAsFrequentExitSite(profiledBlock);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -3745,9 +3743,7 @@
</span><span class="cx"> FTL::JITCode* jitCode = m_jitCode->ftl();
</span><span class="cx"> for (unsigned i = 0; i < jitCode->osrExit.size(); ++i) {
</span><span class="cx"> FTL::OSRExit& exit = jitCode->osrExit[i];
</span><del>-
- if (!exit.considerAddingAsFrequentExitSite(profiledBlock))
- continue;
</del><ins>+ exit.considerAddingAsFrequentExitSite(profiledBlock);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoredfgDFGOSRExith"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExit.h (180739 => 180740)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExit.h 2015-02-27 12:09:34 UTC (rev 180739)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExit.h 2015-02-27 12:13:01 UTC (rev 180740)
</span><span class="lines">@@ -104,9 +104,9 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ValueRecoveryOverride> m_valueRecoveryOverride;
</span><span class="cx">
</span><del>- bool considerAddingAsFrequentExitSite(CodeBlock* profiledCodeBlock)
</del><ins>+ void considerAddingAsFrequentExitSite(CodeBlock* profiledCodeBlock)
</ins><span class="cx"> {
</span><del>- return OSRExitBase::considerAddingAsFrequentExitSite(profiledCodeBlock, ExitFromDFG);
</del><ins>+ OSRExitBase::considerAddingAsFrequentExitSite(profiledCodeBlock, ExitFromDFG);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoredfgDFGOSRExitBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExitBase.cpp (180739 => 180740)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExitBase.cpp 2015-02-27 12:09:34 UTC (rev 180739)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExitBase.cpp 2015-02-27 12:13:01 UTC (rev 180740)
</span><span class="lines">@@ -35,15 +35,13 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx">
</span><del>-bool OSRExitBase::considerAddingAsFrequentExitSiteSlow(CodeBlock* profiledCodeBlock, ExitingJITType jitType)
</del><ins>+void OSRExitBase::considerAddingAsFrequentExitSiteSlow(CodeBlock* profiledCodeBlock, ExitingJITType jitType)
</ins><span class="cx"> {
</span><span class="cx"> CodeBlock* sourceProfiledCodeBlock =
</span><span class="cx"> baselineCodeBlockForOriginAndBaselineCodeBlock(
</span><span class="cx"> m_codeOriginForExitProfile, profiledCodeBlock);
</span><del>- if (!sourceProfiledCodeBlock)
- return false;
- return sourceProfiledCodeBlock->addFrequentExitSite(
- FrequentExitSite(m_codeOriginForExitProfile.bytecodeIndex, m_kind, jitType));
</del><ins>+ if (sourceProfiledCodeBlock)
+ sourceProfiledCodeBlock->addFrequentExitSite(FrequentExitSite(m_codeOriginForExitProfile.bytecodeIndex, m_kind, jitType));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoredfgDFGOSRExitBaseh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExitBase.h (180739 => 180740)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExitBase.h 2015-02-27 12:09:34 UTC (rev 180739)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGOSRExitBase.h 2015-02-27 12:13:01 UTC (rev 180740)
</span><span class="lines">@@ -57,15 +57,14 @@
</span><span class="cx"> CodeOrigin m_codeOriginForExitProfile;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- bool considerAddingAsFrequentExitSite(CodeBlock* profiledCodeBlock, ExitingJITType jitType)
</del><ins>+ void considerAddingAsFrequentExitSite(CodeBlock* profiledCodeBlock, ExitingJITType jitType)
</ins><span class="cx"> {
</span><del>- if (!m_count)
- return false;
- return considerAddingAsFrequentExitSiteSlow(profiledCodeBlock, jitType);
</del><ins>+ if (m_count)
+ considerAddingAsFrequentExitSiteSlow(profiledCodeBlock, jitType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool considerAddingAsFrequentExitSiteSlow(CodeBlock* profiledCodeBlock, ExitingJITType);
</del><ins>+ void considerAddingAsFrequentExitSiteSlow(CodeBlock* profiledCodeBlock, ExitingJITType);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreftlFTLOSRExith"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ftl/FTLOSRExit.h (180739 => 180740)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ftl/FTLOSRExit.h 2015-02-27 12:09:34 UTC (rev 180739)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ftl/FTLOSRExit.h 2015-02-27 12:13:01 UTC (rev 180740)
</span><span class="lines">@@ -167,9 +167,9 @@
</span><span class="cx">
</span><span class="cx"> CodeLocationJump codeLocationForRepatch(CodeBlock* ftlCodeBlock) const;
</span><span class="cx">
</span><del>- bool considerAddingAsFrequentExitSite(CodeBlock* profiledCodeBlock)
</del><ins>+ void considerAddingAsFrequentExitSite(CodeBlock* profiledCodeBlock)
</ins><span class="cx"> {
</span><del>- return OSRExitBase::considerAddingAsFrequentExitSite(profiledCodeBlock, ExitFromFTL);
</del><ins>+ OSRExitBase::considerAddingAsFrequentExitSite(profiledCodeBlock, ExitFromFTL);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>