<!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>[187213] trunk/Source/JavaScriptCore</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/187213">187213</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 21:51:48 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify things like CompareEq(@x,@x)
https://bugs.webkit.org/show_bug.cgi?id=145850
Reviewed by Sam Weinig.
This simplifies x==x to true, except in cases where x might be a double (in which case this
might still be false if x is NaN).
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* tests/stress/nan-equal-untyped.js: Added.
(foo):
(test):
* tests/stress/nan-equal.js: Added.
(foo):</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressnanequaluntypedjs">trunk/Source/JavaScriptCore/tests/stress/nan-equal-untyped.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressnanequaljs">trunk/Source/JavaScriptCore/tests/stress/nan-equal.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (187212 => 187213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-07-23 04:47:33 UTC (rev 187212)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-07-23 04:51:48 UTC (rev 187213)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-22 Filip Pizlo <fpizlo@apple.com>
+
+ Simplify things like CompareEq(@x,@x)
+ https://bugs.webkit.org/show_bug.cgi?id=145850
+
+ Reviewed by Sam Weinig.
+
+ This simplifies x==x to true, except in cases where x might be a double (in which case this
+ might still be false if x is NaN).
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * tests/stress/nan-equal-untyped.js: Added.
+ (foo):
+ (test):
+ * tests/stress/nan-equal.js: Added.
+ (foo):
+
</ins><span class="cx"> 2015-07-22 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Timeline should immediately start moving play head when starting a new recording
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (187212 => 187213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-07-23 04:47:33 UTC (rev 187212)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-07-23 04:51:48 UTC (rev 187213)
</span><span class="lines">@@ -1189,6 +1189,34 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (node->child1() == node->child2()) {
+ if (node->isBinaryUseKind(Int32Use) ||
+ node->isBinaryUseKind(Int52RepUse) ||
+ node->isBinaryUseKind(StringUse) ||
+ node->isBinaryUseKind(BooleanUse) ||
+ node->isBinaryUseKind(StringIdentUse) ||
+ node->isBinaryUseKind(ObjectUse) ||
+ node->isBinaryUseKind(ObjectUse, ObjectOrOtherUse) ||
+ node->isBinaryUseKind(ObjectOrOtherUse, ObjectUse)) {
+ switch (node->op()) {
+ case CompareLess:
+ case CompareGreater:
+ setConstant(node, jsBoolean(false));
+ break;
+ case CompareLessEq:
+ case CompareGreaterEq:
+ case CompareEq:
+ case CompareEqConstant:
+ setConstant(node, jsBoolean(true));
+ break;
+ default:
+ DFG_CRASH(m_graph, node, "Unexpected node type");
+ break;
+ }
+ break;
+ }
+ }
+
</ins><span class="cx"> forNode(node).setType(SpecBoolean);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1221,6 +1249,24 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (node->child1() == node->child2()) {
+ if (node->isBinaryUseKind(BooleanUse) ||
+ node->isBinaryUseKind(Int32Use) ||
+ node->isBinaryUseKind(Int52RepUse) ||
+ node->isBinaryUseKind(StringUse) ||
+ node->isBinaryUseKind(StringIdentUse) ||
+ node->isBinaryUseKind(ObjectUse) ||
+ node->isBinaryUseKind(MiscUse, UntypedUse) ||
+ node->isBinaryUseKind(UntypedUse, MiscUse) ||
+ node->isBinaryUseKind(StringIdentUse, NotStringVarUse) ||
+ node->isBinaryUseKind(NotStringVarUse, StringIdentUse) ||
+ node->isBinaryUseKind(StringUse, UntypedUse) ||
+ node->isBinaryUseKind(UntypedUse, StringUse)) {
+ setConstant(node, jsBoolean(true));
+ break;
+ }
+ }
+
</ins><span class="cx"> forNode(node).setType(SpecBoolean);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressnanequaluntypedjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/nan-equal-untyped.js (0 => 187213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/nan-equal-untyped.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/nan-equal-untyped.js 2015-07-23 04:51:48 UTC (rev 187213)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+function foo(x) {
+ return x == x;
+}
+
+noInline(foo);
+
+function test(value) {
+ var result = foo(value);
+ if (result !== true)
+ throw "Error: bad result for " + value + ": " + result;
+}
+
+for (var i = 0; i < 10000; ++i) {
+ test(true);
+ test(4);
+ test("hello");
+ test(new Object());
+ test(1.5);
+}
+
+var result = foo(0/0);
+if (result !== false)
+ throw "Error: bad result at end: " + result;
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressnanequaljs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/nan-equal.js (0 => 187213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/nan-equal.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/nan-equal.js 2015-07-23 04:51:48 UTC (rev 187213)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+function foo(x) {
+ return x == x;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(0/0);
+ if (result !== false)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>