<!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>[168172] 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/168172">168172</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 10:23:30 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DFGAbstractInterpreter should not claim Int52 arithmetic creates Int52s
https://bugs.webkit.org/show_bug.cgi?id=132446
Reviewed by Mark Hahnenberg.
Source/JavaScriptCore:
Basically any arithmetic operation can turn an Int52 into an Int32 or vice-versa, and
our modeling of Int52Rep nodes is such that they can have either Int32 or Int52 type
to indicate a bound on the value. This is useful for knowing, for example, that
Int52Rep(Int32:) returns a value that cannot be outside the Int32 range. Also,
ValueRep(Int52Rep:) uses this to determine whether it may return a double or an int.
But this means that all arithmetic operations must be careful to note that they may
turn Int32 inputs into an Int52 output or vice-versa, as these new tests show.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::makeSafe):
* tests/stress/int52-ai-add-then-filter-int32.js: Added.
(foo):
* tests/stress/int52-ai-mul-and-clean-neg-zero-then-filter-int32.js: Added.
(foo):
* tests/stress/int52-ai-mul-then-filter-int32-directly.js: Added.
(foo):
* tests/stress/int52-ai-mul-then-filter-int32.js: Added.
(foo):
* tests/stress/int52-ai-neg-then-filter-int32.js: Added.
(foo):
* tests/stress/int52-ai-sub-then-filter-int32.js: Added.
(foo):
Tools:
Test the FTL by default now that it's enabled by default.
* Scripts/run-javascriptcore-tests:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjavascriptcoretests">trunk/Tools/Scripts/run-javascriptcore-tests</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressint52aiaddthenfilterint32js">trunk/Source/JavaScriptCore/tests/stress/int52-ai-add-then-filter-int32.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressint52aimulandcleannegzerothenfilterint32js">trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-and-clean-neg-zero-then-filter-int32.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressint52aimulthenfilterint32directlyjs">trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-then-filter-int32-directly.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressint52aimulthenfilterint32js">trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-then-filter-int32.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressint52ainegthenfilterint32js">trunk/Source/JavaScriptCore/tests/stress/int52-ai-neg-then-filter-int32.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressint52aisubthenfilterint32js">trunk/Source/JavaScriptCore/tests/stress/int52-ai-sub-then-filter-int32.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (168171 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-05-02 16:19:32 UTC (rev 168171)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-05-02 Filip Pizlo <fpizlo@apple.com>
+
+ DFGAbstractInterpreter should not claim Int52 arithmetic creates Int52s
+ https://bugs.webkit.org/show_bug.cgi?id=132446
+
+ Reviewed by Mark Hahnenberg.
+
+ Basically any arithmetic operation can turn an Int52 into an Int32 or vice-versa, and
+ our modeling of Int52Rep nodes is such that they can have either Int32 or Int52 type
+ to indicate a bound on the value. This is useful for knowing, for example, that
+ Int52Rep(Int32:) returns a value that cannot be outside the Int32 range. Also,
+ ValueRep(Int52Rep:) uses this to determine whether it may return a double or an int.
+ But this means that all arithmetic operations must be careful to note that they may
+ turn Int32 inputs into an Int52 output or vice-versa, as these new tests show.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::makeSafe):
+ * tests/stress/int52-ai-add-then-filter-int32.js: Added.
+ (foo):
+ * tests/stress/int52-ai-mul-and-clean-neg-zero-then-filter-int32.js: Added.
+ (foo):
+ * tests/stress/int52-ai-mul-then-filter-int32-directly.js: Added.
+ (foo):
+ * tests/stress/int52-ai-mul-then-filter-int32.js: Added.
+ (foo):
+ * tests/stress/int52-ai-neg-then-filter-int32.js: Added.
+ (foo):
+ * tests/stress/int52-ai-sub-then-filter-int32.js: Added.
+ (foo):
+
</ins><span class="cx"> 2014-05-01 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> JavaScriptCore fails to build with some versions of clang
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (168171 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-05-02 16:19:32 UTC (rev 168171)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- forNode(node).setType(SpecInt52);
</del><ins>+ forNode(node).setType(SpecMachineInt);
</ins><span class="cx"> if (!forNode(node->child1()).isType(SpecInt32)
</span><span class="cx"> || !forNode(node->child2()).isType(SpecInt32))
</span><span class="cx"> node->setCanExit(true);
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- forNode(node).setType(SpecInt52);
</del><ins>+ forNode(node).setType(SpecMachineInt);
</ins><span class="cx"> if (!forNode(node->child1()).isType(SpecInt32)
</span><span class="cx"> || !forNode(node->child2()).isType(SpecInt32))
</span><span class="cx"> node->setCanExit(true);
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- forNode(node).setType(SpecInt52);
</del><ins>+ forNode(node).setType(SpecMachineInt);
</ins><span class="cx"> if (m_state.forNode(node->child1()).couldBeType(SpecInt52))
</span><span class="cx"> node->setCanExit(true);
</span><span class="cx"> if (shouldCheckNegativeZero(node->arithMode()))
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- forNode(node).setType(SpecInt52);
</del><ins>+ forNode(node).setType(SpecMachineInt);
</ins><span class="cx"> node->setCanExit(true);
</span><span class="cx"> break;
</span><span class="cx"> case DoubleRepUse:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (168171 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-05-02 16:19:32 UTC (rev 168171)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -925,6 +925,9 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case ArithMul:
</span><ins>+ // FIXME: We should detect cases where we only overflowed but never created
+ // negative zero.
+ // https://bugs.webkit.org/show_bug.cgi?id=132470
</ins><span class="cx"> if (m_inlineStackTop->m_profiledBlock->likelyToTakeDeepestSlowCase(m_currentIndex)
</span><span class="cx"> || m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, Overflow))
</span><span class="cx"> node->mergeFlags(NodeMayOverflow | NodeMayNegZero);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressint52aiaddthenfilterint32js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/int52-ai-add-then-filter-int32.js (0 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/int52-ai-add-then-filter-int32.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/int52-ai-add-then-filter-int32.js 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+function foo(a, b, c) {
+ var o = {f:42};
+ if (DFGTrue())
+ o.f = a + b + c;
+ return o.f | 0;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(2000000000, 2000000000, -2000000000);
+ if (result != 2000000000 && result != 42)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressint52aimulandcleannegzerothenfilterint32js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-and-clean-neg-zero-then-filter-int32.js (0 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-and-clean-neg-zero-then-filter-int32.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-and-clean-neg-zero-then-filter-int32.js 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+function foo(a, b, c) {
+ var o = {f:42};
+ if (DFGTrue())
+ o.f = (a * b + 5) * c + 5;
+ return o.f | 0;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(65536, 65536, 0);
+ if (result != 5 && result != 42)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressint52aimulthenfilterint32directlyjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-then-filter-int32-directly.js (0 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-then-filter-int32-directly.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-then-filter-int32-directly.js 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+function foo(a, b, c) {
+ var o = {f:42};
+ o.f = (a * b + 5) * c + 5;
+ return o.f | 0;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(65536, 65536, 0);
+ if (result != 5 && result != 42)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressint52aimulthenfilterint32js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-then-filter-int32.js (0 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-then-filter-int32.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/int52-ai-mul-then-filter-int32.js 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+function foo(a, b, c) {
+ var o = {f:42};
+ if (DFGTrue())
+ o.f = a * b * c;
+ return o.f | 0;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(65536, 65536, 0);
+ if (result != 0 && result != 42)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressint52ainegthenfilterint32js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/int52-ai-neg-then-filter-int32.js (0 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/int52-ai-neg-then-filter-int32.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/int52-ai-neg-then-filter-int32.js 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+function foo(a, b) {
+ var o = {f:42};
+ if (DFGTrue())
+ o.f = -(a + b);
+ return o.f | 0;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(1073741824, 1073741824);
+ if (result != -2147483648 && result != 42)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressint52aisubthenfilterint32js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/int52-ai-sub-then-filter-int32.js (0 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/int52-ai-sub-then-filter-int32.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/int52-ai-sub-then-filter-int32.js 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+function foo(a, b) {
+ var o = {f:42};
+ if (DFGTrue())
+ o.f = a - b - 2000000000;
+ return o.f | 0;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(2000000000, -2000000000);
+ if (result != 2000000000 && result != 42)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168171 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-02 16:19:32 UTC (rev 168171)
+++ trunk/Tools/ChangeLog 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-02 Filip Pizlo <fpizlo@apple.com>
+
+ DFGAbstractInterpreter should not claim Int52 arithmetic creates Int52s
+ https://bugs.webkit.org/show_bug.cgi?id=132446
+
+ Reviewed by Mark Hahnenberg.
+
+ Test the FTL by default now that it's enabled by default.
+
+ * Scripts/run-javascriptcore-tests:
+
</ins><span class="cx"> 2014-05-01 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK1] Drop ewk_view_setting_tiled_backingstore APIs
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (168171 => 168172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests 2014-05-02 16:19:32 UTC (rev 168171)
+++ trunk/Tools/Scripts/run-javascriptcore-tests 2014-05-02 17:23:30 UTC (rev 168172)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=120809
</span><span class="cx"> my $runJSCStress = !isAppleWinWebKit();
</span><span class="cx">
</span><del>-my $enableFTL = 0;
</del><ins>+my $enableFTL = isAppleWebKit();
</ins><span class="cx">
</span><span class="cx"> my $createTarball = 0;
</span><span class="cx"> my $remoteHost = 0;
</span></span></pre>
</div>
</div>
</body>
</html>