<!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>[173795] 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/173795">173795</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-09-20 14:52:14 -0700 (Sat, 20 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL OSRExit construction should be based on methods that return ExitValues rather than methods that add ExitValues to OSRExit
https://bugs.webkit.org/show_bug.cgi?id=136978
Reviewed by Dean Jackson.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::buildExitArguments):
(JSC::FTL::LowerDFGToLLVM::exitValueForNode):
(JSC::FTL::LowerDFGToLLVM::exitArgument):
(JSC::FTL::LowerDFGToLLVM::addExitArgumentForNode): Deleted.
(JSC::FTL::LowerDFGToLLVM::tryToSetConstantExitArgument): Deleted.
(JSC::FTL::LowerDFGToLLVM::addExitArgument): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173794 => 173795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-20 18:45:54 UTC (rev 173794)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-20 21:52:14 UTC (rev 173795)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-09-20 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL OSRExit construction should be based on methods that return ExitValues rather than methods that add ExitValues to OSRExit
+ https://bugs.webkit.org/show_bug.cgi?id=136978
+
+ Reviewed by Dean Jackson.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::buildExitArguments):
+ (JSC::FTL::LowerDFGToLLVM::exitValueForNode):
+ (JSC::FTL::LowerDFGToLLVM::exitArgument):
+ (JSC::FTL::LowerDFGToLLVM::addExitArgumentForNode): Deleted.
+ (JSC::FTL::LowerDFGToLLVM::tryToSetConstantExitArgument): Deleted.
+ (JSC::FTL::LowerDFGToLLVM::addExitArgument): Deleted.
+
+2014-09-20 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> FTL OSR exit should do reboxing and value recovery in the same pass
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136977
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (173794 => 173795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-09-20 18:45:54 UTC (rev 173794)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-09-20 21:52:14 UTC (rev 173795)
</span><span class="lines">@@ -6408,7 +6408,7 @@
</span><span class="cx"> case DeadFlush:
</span><span class="cx"> case ConflictingFlush:
</span><span class="cx"> if (availability.hasNode()) {
</span><del>- addExitArgumentForNode(exit, arguments, i, availability.node());
</del><ins>+ exit.m_values[i] = exitValueForNode(arguments, availability.node());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6459,93 +6459,73 @@
</span><span class="cx"> m_out.call(m_out.stackmapIntrinsic(), arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void addExitArgumentForNode(
- OSRExit& exit, ExitArgumentList& arguments, unsigned index, Node* node)
</del><ins>+ ExitValue exitValueForNode(ExitArgumentList& arguments, Node* node)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(node->shouldGenerate());
</span><span class="cx"> ASSERT(node->hasResult());
</span><span class="cx">
</span><del>- if (tryToSetConstantExitArgument(exit, index, node))
- return;
</del><ins>+ if (node) {
+ switch (node->op()) {
+ case JSConstant:
+ case Int52Constant:
+ case DoubleConstant:
+ return ExitValue::constant(node->asJSValue());
+
+ case PhantomArguments:
+ return ExitValue::argumentsObjectThatWasNotCreated();
+
+ default:
+ break;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_availableRecoveries.size(); ++i) {
</span><span class="cx"> AvailableRecovery recovery = m_availableRecoveries[i];
</span><span class="cx"> if (recovery.node() != node)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- exit.m_values[index] = ExitValue::recovery(
</del><ins>+ ExitValue result = ExitValue::recovery(
</ins><span class="cx"> recovery.opcode(), arguments.size(), arguments.size() + 1,
</span><span class="cx"> recovery.format());
</span><span class="cx"> arguments.append(recovery.left());
</span><span class="cx"> arguments.append(recovery.right());
</span><del>- return;
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LoweredNodeValue value = m_int32Values.get(node);
</span><del>- if (isValid(value)) {
- addExitArgument(exit, arguments, index, ValueFormatInt32, value.value());
- return;
- }
</del><ins>+ if (isValid(value))
+ return exitArgument(arguments, ValueFormatInt32, value.value());
</ins><span class="cx">
</span><span class="cx"> value = m_int52Values.get(node);
</span><del>- if (isValid(value)) {
- addExitArgument(exit, arguments, index, ValueFormatInt52, value.value());
- return;
- }
</del><ins>+ if (isValid(value))
+ return exitArgument(arguments, ValueFormatInt52, value.value());
</ins><span class="cx">
</span><span class="cx"> value = m_strictInt52Values.get(node);
</span><del>- if (isValid(value)) {
- addExitArgument(exit, arguments, index, ValueFormatStrictInt52, value.value());
- return;
- }
</del><ins>+ if (isValid(value))
+ return exitArgument(arguments, ValueFormatStrictInt52, value.value());
</ins><span class="cx">
</span><span class="cx"> value = m_booleanValues.get(node);
</span><span class="cx"> if (isValid(value)) {
</span><span class="cx"> LValue valueToPass = m_out.zeroExt(value.value(), m_out.int32);
</span><del>- addExitArgument(exit, arguments, index, ValueFormatBoolean, valueToPass);
- return;
</del><ins>+ return exitArgument(arguments, ValueFormatBoolean, valueToPass);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> value = m_jsValueValues.get(node);
</span><del>- if (isValid(value)) {
- addExitArgument(exit, arguments, index, ValueFormatJSValue, value.value());
- return;
- }
</del><ins>+ if (isValid(value))
+ return exitArgument(arguments, ValueFormatJSValue, value.value());
</ins><span class="cx">
</span><span class="cx"> value = m_doubleValues.get(node);
</span><del>- if (isValid(value)) {
- addExitArgument(exit, arguments, index, ValueFormatDouble, value.value());
- return;
- }
</del><ins>+ if (isValid(value))
+ return exitArgument(arguments, ValueFormatDouble, value.value());
</ins><span class="cx">
</span><span class="cx"> DFG_CRASH(m_graph, m_node, toCString("Cannot find value for node: ", node).data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool tryToSetConstantExitArgument(OSRExit& exit, unsigned index, Node* node)
</del><ins>+ ExitValue exitArgument(ExitArgumentList& arguments, ValueFormat format, LValue value)
</ins><span class="cx"> {
</span><del>- if (!node)
- return false;
-
- switch (node->op()) {
- case JSConstant:
- case Int52Constant:
- case DoubleConstant:
- exit.m_values[index] = ExitValue::constant(node->asJSValue());
- return true;
- case PhantomArguments:
- exit.m_values[index] = ExitValue::argumentsObjectThatWasNotCreated();
- return true;
- default:
- return false;
- }
- }
-
- void addExitArgument(
- OSRExit& exit, ExitArgumentList& arguments, unsigned index, ValueFormat format,
- LValue value)
- {
- exit.m_values[index] = ExitValue::exitArgument(ExitArgument(format, arguments.size()));
</del><ins>+ ExitValue result = ExitValue::exitArgument(ExitArgument(format, arguments.size()));
</ins><span class="cx"> arguments.append(value);
</span><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool doesKill(Edge edge)
</span></span></pre>
</div>
</div>
</body>
</html>