<!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>[160252] 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/160252">160252</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-06 14:54:02 -0800 (Fri, 06 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL should support generic ByVal accesses
https://bugs.webkit.org/show_bug.cgi?id=125368
Reviewed by Mark Hahnenberg.
Source/JavaScriptCore:
* dfg/DFGGraph.h:
(JSC::DFG::Graph::isStrictModeFor):
(JSC::DFG::Graph::ecmaModeFor):
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLIntrinsicRepository.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileGetByVal):
(JSC::FTL::LowerDFGToLLVM::compilePutByVal):
LayoutTests:
* js/regress/by-val-generic-expected.txt: Added.
* js/regress/by-val-generic.html: Added.
* js/regress/script-tests/by-val-generic.js: Added.
(foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphh">trunk/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLIntrinsicRepositoryh">trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressbyvalgenericexpectedtxt">trunk/LayoutTests/js/regress/by-val-generic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressbyvalgenerichtml">trunk/LayoutTests/js/regress/by-val-generic.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsbyvalgenericjs">trunk/LayoutTests/js/regress/script-tests/by-val-generic.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160251 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-06 22:43:46 UTC (rev 160251)
+++ trunk/LayoutTests/ChangeLog 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-06 Filip Pizlo <fpizlo@apple.com>
+
+ FTL should support generic ByVal accesses
+ https://bugs.webkit.org/show_bug.cgi?id=125368
+
+ Reviewed by Mark Hahnenberg.
+
+ * js/regress/by-val-generic-expected.txt: Added.
+ * js/regress/by-val-generic.html: Added.
+ * js/regress/script-tests/by-val-generic.js: Added.
+ (foo):
+
</ins><span class="cx"> 2013-12-06 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed gardening; revert r160237 after r160247 made it unnecessary.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressbyvalgenericexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/by-val-generic-expected.txt (0 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/by-val-generic-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/by-val-generic-expected.txt 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/by-val-generic
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressbyvalgenerichtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/by-val-generic.html (0 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/by-val-generic.html (rev 0)
+++ trunk/LayoutTests/js/regress/by-val-generic.html 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/by-val-generic.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsbyvalgenericjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/by-val-generic.js (0 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/by-val-generic.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/by-val-generic.js 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+function foo(a, b, c) {
+ a[b] = c;
+ return a[b];
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo({}, "foo", "bar");
+ if (result !== "bar")
+ throw "Error: bad result: " + result;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160251 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-06 22:43:46 UTC (rev 160251)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2013-12-06 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL should support generic ByVal accesses
+ https://bugs.webkit.org/show_bug.cgi?id=125368
+
+ Reviewed by Mark Hahnenberg.
+
+ * dfg/DFGGraph.h:
+ (JSC::DFG::Graph::isStrictModeFor):
+ (JSC::DFG::Graph::ecmaModeFor):
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLIntrinsicRepository.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::LowerDFGToLLVM::compileGetByVal):
+ (JSC::FTL::LowerDFGToLLVM::compilePutByVal):
+
+2013-12-06 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> FTL should support hole/OOB array accesses
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=118077
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (160251 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2013-12-06 22:43:46 UTC (rev 160251)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -428,6 +428,18 @@
</span><span class="cx"> return baselineCodeBlockForOriginAndBaselineCodeBlock(codeOrigin, m_profiledBlock);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool isStrictModeFor(CodeOrigin codeOrigin)
+ {
+ if (!codeOrigin.inlineCallFrame)
+ return m_codeBlock->isStrictMode();
+ return jsCast<FunctionExecutable*>(codeOrigin.inlineCallFrame->executable.get())->isStrictMode();
+ }
+
+ ECMAMode ecmaModeFor(CodeOrigin codeOrigin)
+ {
+ return isStrictModeFor(codeOrigin) ? StrictMode : NotStrictMode;
+ }
+
</ins><span class="cx"> bool masqueradesAsUndefinedWatchpointIsStillValid(const CodeOrigin& codeOrigin)
</span><span class="cx"> {
</span><span class="cx"> return m_plan.watchpoints.isStillValid(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (160251 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2013-12-06 22:43:46 UTC (rev 160251)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx"> case GetByVal:
</span><span class="cx"> switch (node->arrayMode().type()) {
</span><span class="cx"> case Array::ForceExit:
</span><ins>+ case Array::Generic:
</ins><span class="cx"> case Array::String:
</span><del>- return CanCompileAndOSREnter;
</del><span class="cx"> case Array::Int32:
</span><span class="cx"> case Array::Double:
</span><span class="cx"> case Array::Contiguous:
</span><span class="lines">@@ -161,9 +161,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case PutByVal:
</span><span class="cx"> case PutByValAlias:
</span><ins>+ case PutByValDirect:
</ins><span class="cx"> switch (node->arrayMode().type()) {
</span><span class="cx"> case Array::ForceExit:
</span><del>- return CanCompileAndOSREnter;
</del><ins>+ case Array::Generic:
</ins><span class="cx"> case Array::Int32:
</span><span class="cx"> case Array::Double:
</span><span class="cx"> case Array::Contiguous:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLIntrinsicRepositoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h (160251 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2013-12-06 22:43:46 UTC (rev 160251)
+++ trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> macro(I_JITOperation_EJss, functionType(intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(J_JITOperation_E, functionType(int64, intPtr)) \
</span><span class="cx"> macro(J_JITOperation_EAZ, functionType(int64, intPtr, intPtr, int32)) \
</span><ins>+ macro(J_JITOperation_EJJ, functionType(int64, intPtr, int64, int64)) \
</ins><span class="cx"> macro(J_JITOperation_EJssZ, functionType(int64, intPtr, intPtr, int32)) \
</span><span class="cx"> macro(J_JITOperation_ESsiJI, functionType(int64, intPtr, intPtr, int64, intPtr)) \
</span><span class="cx"> macro(Jss_JITOperation_EZ, functionType(intPtr, intPtr, int32)) \
</span><span class="lines">@@ -65,6 +66,7 @@
</span><span class="cx"> macro(P_JITOperation_EStPS, functionType(intPtr, intPtr, intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(P_JITOperation_EStSS, functionType(intPtr, intPtr, intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(P_JITOperation_EStZ, functionType(intPtr, intPtr, intPtr, int32)) \
</span><ins>+ macro(V_JITOperation_EJJJ, functionType(voidType, intPtr, int64, int64, int64)) \
</ins><span class="cx"> macro(V_JITOperation_EOZD, functionType(voidType, intPtr, intPtr, int32, doubleType)) \
</span><span class="cx"> macro(V_JITOperation_EOZJ, functionType(voidType, intPtr, intPtr, int32, int64)) \
</span><span class="cx"> macro(V_JITOperation_EVws, functionType(voidType, intPtr, intPtr)) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (160251 => 160252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2013-12-06 22:43:46 UTC (rev 160251)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2013-12-06 22:54:02 UTC (rev 160252)
</span><span class="lines">@@ -362,6 +362,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case PutByVal:
</span><span class="cx"> case PutByValAlias:
</span><ins>+ case PutByValDirect:
</ins><span class="cx"> compilePutByVal();
</span><span class="cx"> break;
</span><span class="cx"> case NewObject:
</span><span class="lines">@@ -1580,6 +1581,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case Array::Generic: {
+ setJSValue(vmCall(
+ m_out.operation(operationGetByVal), m_callFrame,
+ lowJSValue(m_node->child1()), lowJSValue(m_node->child2())));
+ return;
+ }
+
</ins><span class="cx"> case Array::String: {
</span><span class="cx"> compileStringCharAt();
</span><span class="cx"> return;
</span><span class="lines">@@ -1678,6 +1686,31 @@
</span><span class="cx"> Edge child2 = m_graph.varArgChild(m_node, 1);
</span><span class="cx"> Edge child3 = m_graph.varArgChild(m_node, 2);
</span><span class="cx"> Edge child4 = m_graph.varArgChild(m_node, 3);
</span><ins>+
+ switch (m_node->arrayMode().type()) {
+ case Array::Generic: {
+ V_JITOperation_EJJJ operation;
+ if (m_node->op() == PutByValDirect) {
+ if (m_graph.isStrictModeFor(m_node->codeOrigin))
+ operation = operationPutByValDirectStrict;
+ else
+ operation = operationPutByValDirectNonStrict;
+ } else {
+ if (m_graph.isStrictModeFor(m_node->codeOrigin))
+ operation = operationPutByValStrict;
+ else
+ operation = operationPutByValNonStrict;
+ }
+
+ vmCall(
+ m_out.operation(operation), m_callFrame,
+ lowJSValue(child1), lowJSValue(child2), lowJSValue(child3));
+ return;
+ }
+
+ default:
+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> LValue base = lowCell(child1);
</span><span class="cx"> LValue index = lowInt32(child2);
</span><span class="lines">@@ -1759,7 +1792,7 @@
</span><span class="cx"> TypedArrayType type = m_node->arrayMode().typedArrayType();
</span><span class="cx">
</span><span class="cx"> if (isTypedView(type)) {
</span><del>- if (m_node->op() == PutByVal) {
</del><ins>+ if (m_node->op() != PutByValAlias) {
</ins><span class="cx"> speculate(
</span><span class="cx"> OutOfBounds, noValue(), 0,
</span><span class="cx"> m_out.aboveOrEqual(
</span></span></pre>
</div>
</div>
</body>
</html>