<!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>[180431] branches/safari-600.1.4.15-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/180431">180431</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 11:32:06 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/180237">r180237</a>. rdar://problem/19871091</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoreChangeLog">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoredfgDFGGraphh">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoredfgDFGStackLayoutPhasecpp">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog (180430 => 180431)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog 2015-02-20 19:28:41 UTC (rev 180430)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog 2015-02-20 19:32:06 UTC (rev 180431)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-02-20 Lucas Forschler <lforschler@apple.com>
+
+ Merge r180237
+
+ 2015-02-17 Filip Pizlo <fpizlo@apple.com>
+
+ StackLayoutPhase should use CodeBlock::usesArguments rather than FunctionExecutable::usesArguments
+ https://bugs.webkit.org/show_bug.cgi?id=141721
+ rdar://problem/17198633
+
+ Reviewed by Michael Saboff.
+
+ I've seen cases where the two are out of sync. We know we can trust the CodeBlock::usesArguments because
+ we use it everywhere else.
+
+ No test because I could never reproduce the crash.
+
+ * dfg/DFGGraph.h:
+ (JSC::DFG::Graph::usesArguments):
+ * dfg/DFGStackLayoutPhase.cpp:
+ (JSC::DFG::StackLayoutPhase::run):
+
</ins><span class="cx"> 2015-02-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178224.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGGraph.h (180430 => 180431)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGGraph.h 2015-02-20 19:28:41 UTC (rev 180430)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGGraph.h 2015-02-20 19:32:06 UTC (rev 180431)
</span><span class="lines">@@ -481,6 +481,14 @@
</span><span class="cx"> return hasExitSite(node->origin.semantic, exitKind);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool usesArguments(InlineCallFrame* inlineCallFrame)
+ {
+ if (!inlineCallFrame)
+ return m_profiledBlock->usesArguments();
+
+ return baselineCodeBlockForInlineCallFrame(inlineCallFrame)->usesArguments();
+ }
+
</ins><span class="cx"> VirtualRegister argumentsRegisterFor(InlineCallFrame* inlineCallFrame)
</span><span class="cx"> {
</span><span class="cx"> if (!inlineCallFrame)
</span></span></pre></div>
<a id="branchessafari6001415branchSourceJavaScriptCoredfgDFGStackLayoutPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp (180430 => 180431)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp 2015-02-20 19:28:41 UTC (rev 180430)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp 2015-02-20 19:32:06 UTC (rev 180431)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> usedLocals.set(codeBlock()->activationRegister().toLocal());
</span><span class="cx"> for (InlineCallFrameSet::iterator iter = m_graph.m_plan.inlineCallFrames->begin(); !!iter; ++iter) {
</span><span class="cx"> InlineCallFrame* inlineCallFrame = *iter;
</span><del>- if (!inlineCallFrame->executable->usesArguments())
</del><ins>+ if (!m_graph.usesArguments(inlineCallFrame))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> VirtualRegister argumentsRegister = m_graph.argumentsRegisterFor(inlineCallFrame);
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> InlineVariableData data = m_graph.m_inlineVariableData[i];
</span><span class="cx"> InlineCallFrame* inlineCallFrame = data.inlineCallFrame;
</span><span class="cx">
</span><del>- if (inlineCallFrame->executable->usesArguments()) {
</del><ins>+ if (m_graph.usesArguments(inlineCallFrame)) {
</ins><span class="cx"> inlineCallFrame->argumentsRegister = virtualRegisterForLocal(
</span><span class="cx"> allocation[m_graph.argumentsRegisterFor(inlineCallFrame).toLocal()]);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>