<!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>[204697] 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/204697">204697</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-08-21 12:45:50 -0700 (Sun, 21 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[DFG] Should not fixup AnyIntUse in 32_64
https://bugs.webkit.org/show_bug.cgi?id=161029
Reviewed by Saam Barati.
JSTests:
* typeProfiler/int52-dfg.js: Added.
(test):
* typeProfiler/number-filter-dfg.js: Added.
(test):
Source/JavaScriptCore:
DFG fixup phase uses AnyIntUse even in 32bit DFG. This patch removes this incorrect filtering.
If the 32bit DFG see the TypeAnyInt, it should fallback to the NumberUse case.
And this patch also fixes the case that the type set only contains TypeNumber. Previously,
we used NumberUse edge filtering. But it misses AnyInt logging: While the NumberUse filter
passes both TypeAnyInt and TypeNumber, the type set only logged TypeNumber.
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTeststypeProfilerint52dfgjs">trunk/JSTests/typeProfiler/int52-dfg.js</a></li>
<li><a href="#trunkJSTeststypeProfilernumberfilterdfgjs">trunk/JSTests/typeProfiler/number-filter-dfg.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (204696 => 204697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-08-21 18:13:23 UTC (rev 204696)
+++ trunk/JSTests/ChangeLog 2016-08-21 19:45:50 UTC (rev 204697)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-21 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [DFG] Should not fixup AnyIntUse in 32_64
+ https://bugs.webkit.org/show_bug.cgi?id=161029
+
+ Reviewed by Saam Barati.
+
+ * typeProfiler/int52-dfg.js: Added.
+ (test):
+ * typeProfiler/number-filter-dfg.js: Added.
+ (test):
+
</ins><span class="cx"> 2016-08-19 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] ArithSqrt should work with any argument type
</span></span></pre></div>
<a id="trunkJSTeststypeProfilerint52dfgjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/typeProfiler/int52-dfg.js (0 => 204697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/typeProfiler/int52-dfg.js (rev 0)
+++ trunk/JSTests/typeProfiler/int52-dfg.js 2016-08-21 19:45:50 UTC (rev 204697)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+load("./driver/driver.js");
+
+function test()
+{
+ var ok = 0;
+ for (var i = 0; i < 1e4; ++i) {
+ ok += 0xfffffffff; // Int52
+ }
+ return ok;
+}
+test();
+
+var types = findTypeForExpression(test, "ok += 0x");
+assert(types.instructionTypeSet.primitiveTypeNames.length === 1, "Primitive type names should one candidate.");
+assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Integer) !== -1, "Primitive type names should contain 'Integer'");
</ins></span></pre></div>
<a id="trunkJSTeststypeProfilernumberfilterdfgjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/typeProfiler/number-filter-dfg.js (0 => 204697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/typeProfiler/number-filter-dfg.js (rev 0)
+++ trunk/JSTests/typeProfiler/number-filter-dfg.js 2016-08-21 19:45:50 UTC (rev 204697)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+load("./driver/driver.js");
+
+function test(value)
+{
+ var ok = 0.5;
+ ok += value;
+ return ok;
+}
+noInline(test);
+for (var i = 0; i < 1e4; ++i)
+ test(1.2);
+test(0.5);
+var types = findTypeForExpression(test, "ok += value");
+assert(types.instructionTypeSet.primitiveTypeNames.length === 2, "Primitive type names should two candidates.");
+assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Integer) !== -1, "Primitive type names should contain 'Integer'");
+assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Number) !== -1, "Primitive type names should contain 'Number'");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204696 => 204697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-21 18:13:23 UTC (rev 204696)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-21 19:45:50 UTC (rev 204697)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-21 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [DFG] Should not fixup AnyIntUse in 32_64
+ https://bugs.webkit.org/show_bug.cgi?id=161029
+
+ Reviewed by Saam Barati.
+
+ DFG fixup phase uses AnyIntUse even in 32bit DFG. This patch removes this incorrect filtering.
+ If the 32bit DFG see the TypeAnyInt, it should fallback to the NumberUse case.
+
+ And this patch also fixes the case that the type set only contains TypeNumber. Previously,
+ we used NumberUse edge filtering. But it misses AnyInt logging: While the NumberUse filter
+ passes both TypeAnyInt and TypeNumber, the type set only logged TypeNumber.
+
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+
</ins><span class="cx"> 2016-08-20 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Remote Inspector: some methods don't need to be marked virtual anymore
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (204696 => 204697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2016-08-21 18:13:23 UTC (rev 204696)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2016-08-21 19:45:50 UTC (rev 204697)
</span><span class="lines">@@ -1459,12 +1459,23 @@
</span><span class="cx"> RefPtr<TypeSet> typeSet = node->typeLocation()->m_instructionTypeSet;
</span><span class="cx"> RuntimeTypeMask seenTypes = typeSet->seenTypes();
</span><span class="cx"> if (typeSet->doesTypeConformTo(TypeAnyInt)) {
</span><del>- if (node->child1()->shouldSpeculateInt32())
</del><ins>+ if (node->child1()->shouldSpeculateInt32()) {
</ins><span class="cx"> fixEdge<Int32Use>(node->child1());
</span><del>- else
</del><ins>+ node->remove();
+ break;
+ }
+
+ if (enableInt52()) {
</ins><span class="cx"> fixEdge<AnyIntUse>(node->child1());
</span><del>- node->remove();
- } else if (typeSet->doesTypeConformTo(TypeNumber | TypeAnyInt)) {
</del><ins>+ node->remove();
+ break;
+ }
+
+ // Must not perform fixEdge<NumberUse> here since the type set only includes TypeAnyInt. Double values should be logged.
+ }
+
+ if (typeSet->doesTypeConformTo(TypeNumber | TypeAnyInt) && ((seenTypes & TypeNumber) && (seenTypes & TypeAnyInt))) {
+ // NumberUse can pass TypeNumber and TypeAnyInt. Thus, this node removal is allowed only if both TypeNumber and TypeAnyInt are logged in the type set.
</ins><span class="cx"> fixEdge<NumberUse>(node->child1());
</span><span class="cx"> node->remove();
</span><span class="cx"> } else if (typeSet->doesTypeConformTo(TypeString)) {
</span></span></pre>
</div>
</div>
</body>
</html>