<!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>[160257] 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/160257">160257</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-06 15:20:09 -0800 (Fri, 06 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL should support all of Branch/LogicalNot
https://bugs.webkit.org/show_bug.cgi?id=125370
Reviewed by Mark Hahnenberg.
Source/JavaScriptCore:
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLIntrinsicRepository.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::boolify):
LayoutTests:
* js/regress/logical-not-expected.txt: Added.
* js/regress/logical-not.html: Added.
* js/regress/script-tests/logical-not.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="#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="#trunkLayoutTestsjsregresslogicalnotexpectedtxt">trunk/LayoutTests/js/regress/logical-not-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregresslogicalnothtml">trunk/LayoutTests/js/regress/logical-not.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestslogicalnotjs">trunk/LayoutTests/js/regress/script-tests/logical-not.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160256 => 160257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-06 23:14:03 UTC (rev 160256)
+++ trunk/LayoutTests/ChangeLog 2013-12-06 23:20:09 UTC (rev 160257)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2013-12-06 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL should support all of Branch/LogicalNot
+ https://bugs.webkit.org/show_bug.cgi?id=125370
+
+ Reviewed by Mark Hahnenberg.
+
+ * js/regress/logical-not-expected.txt: Added.
+ * js/regress/logical-not.html: Added.
+ * js/regress/script-tests/logical-not.js: Added.
+ (foo):
+
+2013-12-06 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> FTL should support generic ByVal accesses
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125368
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsregresslogicalnotexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/logical-not-expected.txt (0 => 160257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/logical-not-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/logical-not-expected.txt 2013-12-06 23:20:09 UTC (rev 160257)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/logical-not
+
+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="trunkLayoutTestsjsregresslogicalnothtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/logical-not.html (0 => 160257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/logical-not.html (rev 0)
+++ trunk/LayoutTests/js/regress/logical-not.html 2013-12-06 23:20:09 UTC (rev 160257)
</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/logical-not.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="trunkLayoutTestsjsregressscripttestslogicalnotjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/logical-not.js (0 => 160257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/logical-not.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/logical-not.js 2013-12-06 23:20:09 UTC (rev 160257)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+function foo(v) {
+ return !v;
+}
+
+noInline(foo);
+
+var array = ["foo", 42, null, {}, true, false];
+var expected = [false, false, true, false, false, true];
+
+for (var i = 0; i < 200000; ++i) {
+ var result = foo(array[i % array.length]);
+ if (result !== expected[i % array.length])
+ throw "Error: bad result at " + i + ": " + result;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160256 => 160257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-06 23:14:03 UTC (rev 160256)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-06 23:20:09 UTC (rev 160257)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-06 Filip Pizlo <fpizlo@apple.com>
+
+ FTL should support all of Branch/LogicalNot
+ https://bugs.webkit.org/show_bug.cgi?id=125370
+
+ Reviewed by Mark Hahnenberg.
+
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLIntrinsicRepository.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::boolify):
+
</ins><span class="cx"> 2013-12-06 Roger Fong <roger_fong@apple.com> and Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Support compiling with VS2013
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (160256 => 160257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2013-12-06 23:14:03 UTC (rev 160256)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2013-12-06 23:20:09 UTC (rev 160257)
</span><span class="lines">@@ -106,6 +106,8 @@
</span><span class="cx"> case VariableWatchpoint:
</span><span class="cx"> case NotifyWrite:
</span><span class="cx"> case ValueToInt32:
</span><ins>+ case Branch:
+ case LogicalNot:
</ins><span class="cx"> // These are OK.
</span><span class="cx"> break;
</span><span class="cx"> case GetById:
</span><span class="lines">@@ -197,19 +199,6 @@
</span><span class="cx"> if (node->isBinaryUseKind(NumberUse))
</span><span class="cx"> break;
</span><span class="cx"> return CannotCompile;
</span><del>- case Branch:
- case LogicalNot:
- switch (node->child1().useKind()) {
- case BooleanUse:
- case Int32Use:
- case NumberUse:
- case StringUse:
- case ObjectOrOtherUse:
- break;
- default:
- return CannotCompile;
- }
- break;
</del><span class="cx"> case Switch:
</span><span class="cx"> switch (node->switchData()->kind) {
</span><span class="cx"> case SwitchImm:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLIntrinsicRepositoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h (160256 => 160257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2013-12-06 23:14:03 UTC (rev 160256)
+++ trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2013-12-06 23:20:09 UTC (rev 160257)
</span><span class="lines">@@ -66,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(S_JITOperation_EJ, functionType(intPtr, intPtr, int64)) \
</ins><span class="cx"> macro(V_JITOperation_EJJJ, functionType(voidType, intPtr, int64, int64, int64)) \
</span><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></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (160256 => 160257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2013-12-06 23:14:03 UTC (rev 160256)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2013-12-06 23:20:09 UTC (rev 160257)
</span><span class="lines">@@ -2974,6 +2974,27 @@
</span><span class="cx"> LValue length = m_out.load32(stringValue, m_heaps.JSString_length);
</span><span class="cx"> return m_out.notEqual(length, m_out.int32Zero);
</span><span class="cx"> }
</span><ins>+ case UntypedUse: {
+ LValue value = lowJSValue(m_node->child1());
+
+ LBasicBlock slowCase = FTL_NEW_BLOCK(m_out, ("Boolify untyped slow case"));
+ LBasicBlock fastCase = FTL_NEW_BLOCK(m_out, ("Boolify untyped fast case"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("Boolify untyped continuation"));
+
+ m_out.branch(isNotBoolean(value), slowCase, fastCase);
+
+ LBasicBlock lastNext = m_out.appendTo(fastCase, slowCase);
+ ValueFromBlock fastResult = m_out.anchor(unboxBoolean(value));
+ m_out.jump(continuation);
+
+ m_out.appendTo(slowCase, continuation);
+ ValueFromBlock slowResult = m_out.anchor(m_out.notNull(vmCall(
+ m_out.operation(operationConvertJSValueToBoolean), m_callFrame, value)));
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ return m_out.phi(m_out.boolean, fastResult, slowResult);
+ }
</ins><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span></span></pre>
</div>
</div>
</body>
</html>