<!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>[196642] 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/196642">196642</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-02-16 11:12:36 -0800 (Tue, 16 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL should support StringFromCharCode
https://bugs.webkit.org/show_bug.cgi?id=154267
Source/JavaScriptCore:
rdar://problem/24192536
Reviewed by Mark Lam.
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode): Fix a bug preventing the UntypedUse from being effective.
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileNode):
(JSC::FTL::DFG::LowerDFGToLLVM::compileStringFromCharCode): Implement the opcode.
* tests/stress/string-from-char-code-slow.js: Added.
LayoutTests:
Reviewed by Mark Lam.
* js/regress/script-tests/string-from-char-code.js: Added.
(result):
* js/regress/script-tests/untyped-string-from-char-code.js: Added.
(result):
* js/regress/string-from-char-code-expected.txt: Added.
* js/regress/string-from-char-code.html: Added.
* js/regress/untyped-string-from-char-code-expected.txt: Added.
* js/regress/untyped-string-from-char-code.html: Added.</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="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressscripttestsstringfromcharcodejs">trunk/LayoutTests/js/regress/script-tests/string-from-char-code.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsuntypedstringfromcharcodejs">trunk/LayoutTests/js/regress/script-tests/untyped-string-from-char-code.js</a></li>
<li><a href="#trunkLayoutTestsjsregressstringfromcharcodeexpectedtxt">trunk/LayoutTests/js/regress/string-from-char-code-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressstringfromcharcodehtml">trunk/LayoutTests/js/regress/string-from-char-code.html</a></li>
<li><a href="#trunkLayoutTestsjsregressuntypedstringfromcharcodeexpectedtxt">trunk/LayoutTests/js/regress/untyped-string-from-char-code-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressuntypedstringfromcharcodehtml">trunk/LayoutTests/js/regress/untyped-string-from-char-code.html</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressstringfromcharcodeslowjs">trunk/Source/JavaScriptCore/tests/stress/string-from-char-code-slow.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196641 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-16 18:48:36 UTC (rev 196641)
+++ trunk/LayoutTests/ChangeLog 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-02-16 Filip Pizlo <fpizlo@apple.com>
+
+ FTL should support StringFromCharCode
+ https://bugs.webkit.org/show_bug.cgi?id=154267
+
+ Reviewed by Mark Lam.
+
+ * js/regress/script-tests/string-from-char-code.js: Added.
+ (result):
+ * js/regress/script-tests/untyped-string-from-char-code.js: Added.
+ (result):
+ * js/regress/string-from-char-code-expected.txt: Added.
+ * js/regress/string-from-char-code.html: Added.
+ * js/regress/untyped-string-from-char-code-expected.txt: Added.
+ * js/regress/untyped-string-from-char-code.html: Added.
+
</ins><span class="cx"> 2016-02-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] No hover-horizontal scrolling available
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsstringfromcharcodejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/string-from-char-code.js (0 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/string-from-char-code.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/string-from-char-code.js 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+var result = (function() {
+ var result;
+ for (var i = 0; i < 10000000; ++i)
+ result = String.fromCharCode(32);
+ return result
+})();
+
+if (result != " ")
+ throw "Error: bad result: " + result;
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsuntypedstringfromcharcodejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/untyped-string-from-char-code.js (0 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/untyped-string-from-char-code.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/untyped-string-from-char-code.js 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+var result = (function(a) {
+ a[0] = 32;
+
+ var result;
+ for (var i = 0; i < 1000000; ++i)
+ result = String.fromCharCode(a[0]);
+ return result
+})(new Float64Array(1));
+
+if (result != " ")
+ throw "Error: bad result: " + result;
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressstringfromcharcodeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/string-from-char-code-expected.txt (0 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/string-from-char-code-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/string-from-char-code-expected.txt 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/string-from-char-code
+
+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="trunkLayoutTestsjsregressstringfromcharcodehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/string-from-char-code.html (0 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/string-from-char-code.html (rev 0)
+++ trunk/LayoutTests/js/regress/string-from-char-code.html 2016-02-16 19:12:36 UTC (rev 196642)
</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/string-from-char-code.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="trunkLayoutTestsjsregressuntypedstringfromcharcodeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/untyped-string-from-char-code-expected.txt (0 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/untyped-string-from-char-code-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/untyped-string-from-char-code-expected.txt 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/untyped-string-from-char-code
+
+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="trunkLayoutTestsjsregressuntypedstringfromcharcodehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/untyped-string-from-char-code.html (0 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/untyped-string-from-char-code.html (rev 0)
+++ trunk/LayoutTests/js/regress/untyped-string-from-char-code.html 2016-02-16 19:12:36 UTC (rev 196642)
</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/untyped-string-from-char-code.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="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196641 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-16 18:48:36 UTC (rev 196641)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-02-16 Filip Pizlo <fpizlo@apple.com>
+
+ FTL should support StringFromCharCode
+ https://bugs.webkit.org/show_bug.cgi?id=154267
+ rdar://problem/24192536
+
+ Reviewed by Mark Lam.
+
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode): Fix a bug preventing the UntypedUse from being effective.
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileStringFromCharCode): Implement the opcode.
+ * tests/stress/string-from-char-code-slow.js: Added.
+
</ins><span class="cx"> 2016-02-15 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] BranchAdd can override arguments of its stackmap
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (196641 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2016-02-16 18:48:36 UTC (rev 196641)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -602,11 +602,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case StringFromCharCode:
</span><del>- if (node->child1()->shouldSpeculateUntypedForArithmetic()) {
</del><ins>+ if (node->child1()->shouldSpeculateInt32())
+ fixEdge<Int32Use>(node->child1());
+ else
</ins><span class="cx"> fixEdge<UntypedUse>(node->child1());
</span><del>- break;
- }
- fixEdge<Int32Use>(node->child1());
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case StringCharAt:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (196641 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2016-02-16 18:48:36 UTC (rev 196641)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx"> case CheckIdent:
</span><span class="cx"> case CheckWatchdogTimer:
</span><span class="cx"> case StringCharCodeAt:
</span><ins>+ case StringFromCharCode:
</ins><span class="cx"> case AllocatePropertyStorage:
</span><span class="cx"> case ReallocatePropertyStorage:
</span><span class="cx"> case GetTypedArrayByteOffset:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (196641 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-02-16 18:48:36 UTC (rev 196641)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -870,6 +870,9 @@
</span><span class="cx"> case StringCharCodeAt:
</span><span class="cx"> compileStringCharCodeAt();
</span><span class="cx"> break;
</span><ins>+ case StringFromCharCode:
+ compileStringFromCharCode();
+ break;
</ins><span class="cx"> case GetByOffset:
</span><span class="cx"> case GetGetterSetterByOffset:
</span><span class="cx"> compileGetByOffset();
</span><span class="lines">@@ -4521,6 +4524,50 @@
</span><span class="cx">
</span><span class="cx"> setInt32(m_out.phi(m_out.int32, char8Bit, char16Bit));
</span><span class="cx"> }
</span><ins>+
+ void compileStringFromCharCode()
+ {
+ Edge childEdge = m_node->child1();
+
+ if (childEdge.useKind() == UntypedUse) {
+ LValue result = vmCall(
+ m_out.int64, m_out.operation(operationStringFromCharCodeUntyped), m_callFrame,
+ lowJSValue(childEdge));
+ setJSValue(result);
+ return;
+ }
+
+ DFG_ASSERT(m_graph, m_node, childEdge.useKind() == Int32Use);
+
+ LValue value = lowInt32(childEdge);
+
+ LBasicBlock smallIntCase = FTL_NEW_BLOCK(m_out, ("StringFromCharCode small int case"));
+ LBasicBlock slowCase = FTL_NEW_BLOCK(m_out, ("StringFromCharCode slow case"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("StringFromCharCode continuation"));
+
+ m_out.branch(
+ m_out.aboveOrEqual(value, m_out.constInt32(0xff)),
+ rarely(slowCase), usually(smallIntCase));
+
+ LBasicBlock lastNext = m_out.appendTo(smallIntCase, slowCase);
+
+ LValue smallStrings = m_out.constIntPtr(vm().smallStrings.singleCharacterStrings());
+ LValue fastResultValue = m_out.loadPtr(
+ m_out.baseIndex(m_heaps.singleCharacterStrings, smallStrings, m_out.zeroExtPtr(value)));
+ ValueFromBlock fastResult = m_out.anchor(fastResultValue);
+ m_out.jump(continuation);
+
+ m_out.appendTo(slowCase, continuation);
+
+ LValue slowResultValue = vmCall(
+ m_out.intPtr, m_out.operation(operationStringFromCharCode), m_callFrame, value);
+ ValueFromBlock slowResult = m_out.anchor(slowResultValue);
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+
+ setJSValue(m_out.phi(m_out.int64, fastResult, slowResult));
+ }
</ins><span class="cx">
</span><span class="cx"> void compileGetByOffset()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressstringfromcharcodeslowjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/string-from-char-code-slow.js (0 => 196642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/string-from-char-code-slow.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/string-from-char-code-slow.js 2016-02-16 19:12:36 UTC (rev 196642)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+var result = (function() {
+ var result;
+ for (var i = 0; i < 1000000; ++i)
+ result = String.fromCharCode(1000);
+ return result
+})();
+
+if (result != "Ϩ")
+ throw "Error: bad result: " + result;
+
</ins></span></pre>
</div>
</div>
</body>
</html>