<!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>[186754] branches/safari-601.1-branch/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/186754">186754</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-12 23:50:43 -0700 (Sun, 12 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/186702">r186702</a>. rdar://problem/21736607</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceJavaScriptCoreChangeLog">branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">branches/safari-601.1-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceJavaScriptCoretestsstressmiscisobjectornulljs">branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/misc-is-object-or-null.js</a></li>
<li><a href="#branchessafari6011branchSourceJavaScriptCoretestsstressotherisobjectornulljs">branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/other-is-object-or-null.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog (186753 => 186754)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog 2015-07-13 06:49:28 UTC (rev 186753)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog 2015-07-13 06:50:43 UTC (rev 186754)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-07-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186702.
+
+ 2015-07-10 Filip Pizlo <fpizlo@apple.com>
+
+ AI folding of IsObjectOrNull is broken for non-object types that may be null
+ https://bugs.webkit.org/show_bug.cgi?id=146867
+
+ Reviewed by Ryosuke Niwa.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects): Fix the bug and add some text describing what is going on.
+ * tests/stress/misc-is-object-or-null.js: Added. Test for the bug.
+ (foo):
+ * tests/stress/other-is-object-or-null.js: Added. Test for a bug I almost introduced.
+ (foo):
+
+2015-07-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r186691.
</span><span class="cx">
</span><span class="cx"> 2015-07-04 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (186753 => 186754)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-07-13 06:49:28 UTC (rev 186753)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-07-13 06:50:43 UTC (rev 186754)
</span><span class="lines">@@ -961,6 +961,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // FIXME: This code should really use AbstractValue::isType() and
+ // AbstractValue::couldBeType().
+ // https://bugs.webkit.org/show_bug.cgi?id=146870
+
</ins><span class="cx"> bool constantWasSet = false;
</span><span class="cx"> switch (node->op()) {
</span><span class="cx"> case IsUndefined:
</span><span class="lines">@@ -1034,13 +1038,28 @@
</span><span class="cx"> // FIXME: Use the masquerades-as-undefined watchpoint thingy.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=144456
</span><span class="cx">
</span><ins>+ // These expressions are complicated to parse. A helpful way to parse this is that
+ // "!(T & ~S)" means "T is a subset of S". Conversely, "!(T & S)" means "T is a
+ // disjoint set from S". Things like "T - S" means that, provided that S is a
+ // subset of T, it's the "set of all things in T but not in S". Things like "T | S"
+ // mean the "union of T and S".
+
+ // Is the child's type an object that isn't an other-object (i.e. object that could
+ // have masquaredes-as-undefined traps) and isn't a function? Then: we should fold
+ // this to true.
</ins><span class="cx"> if (!(child.m_type & ~(SpecObject - SpecObjectOther - SpecFunction))) {
</span><span class="cx"> setConstant(node, jsBoolean(true));
</span><span class="cx"> constantWasSet = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!(child.m_type & (SpecObject - SpecFunction))) {
</del><ins>+ // Is the child's type definitely not either of: an object that isn't a function,
+ // or either undefined or null? Then: we should fold this to false. This means
+ // for example that if it's any non-function object, including those that have
+ // masquerades-as-undefined traps, then we don't fold. It also means we won't fold
+ // if it's undefined-or-null, since the type bits don't distinguish between
+ // undefined (which should fold to false) and null (which should fold to true).
+ if (!(child.m_type & ((SpecObject - SpecFunction) | SpecOther))) {
</ins><span class="cx"> setConstant(node, jsBoolean(false));
</span><span class="cx"> constantWasSet = true;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="branchessafari6011branchSourceJavaScriptCoretestsstressmiscisobjectornulljsfromrev186702trunkSourceJavaScriptCoretestsstressmiscisobjectornulljs"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/misc-is-object-or-null.js (from rev 186702, trunk/Source/JavaScriptCore/tests/stress/misc-is-object-or-null.js) (0 => 186754)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/misc-is-object-or-null.js (rev 0)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/misc-is-object-or-null.js 2015-07-13 06:50:43 UTC (rev 186754)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+function foo(p) {
+ var x = p ? null : false;
+ return (typeof x) == "object";
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var p = !!(i & 1);
+ var result = foo(p);
+ if (result !== p)
+ throw "Error: bad result for p = " + p + ": " + result;
+}
</ins></span></pre></div>
<a id="branchessafari6011branchSourceJavaScriptCoretestsstressotherisobjectornulljsfromrev186702trunkSourceJavaScriptCoretestsstressotherisobjectornulljs"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/other-is-object-or-null.js (from rev 186702, trunk/Source/JavaScriptCore/tests/stress/other-is-object-or-null.js) (0 => 186754)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/other-is-object-or-null.js (rev 0)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/other-is-object-or-null.js 2015-07-13 06:50:43 UTC (rev 186754)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+function foo(p) {
+ var x = p ? null : void 0;
+ return (typeof x) == "object";
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var p = !!(i & 1);
+ var result = foo(p);
+ if (result !== p)
+ throw "Error: bad result for p = " + p + ": " + result;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>