<!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>[183650] 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/183650">183650</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-30 16:02:33 -0700 (Thu, 30 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>js/regress/is-string-fold-tricky.html and js/regress/is-string-fold.html are crashing
https://bugs.webkit.org/show_bug.cgi?id=144463
Reviewed by Benjamin Poulain.
Source/JavaScriptCore:
Fixup phase was super cleverly folding an IsString(@x) when @x is predicted SpecString
into a Check(String:@x) followed by JSConstant(true). Then in these tests the
ValueAdd(IsString(@x), @stuff) would try to turn this into an integer add by cleverly
converting the boolean into an integer. But as part of doing that, it would try to
short-circuit any profiling by leveraging the fact that the IsString is now a constant,
and it would try to figure out if the addition might overflow. Part of that logic
involved checking if the immediate is either a boolean or a sufficiently small integer.
But: it would check if it's a sufficiently small integer before checking if it was a
boolean, so it would try to call asNumber() on the boolean.
All of this cleverness was very deliberate, but apparently the @stuff + booleanConstant
case was previously never hit until I wrote these tests, and so we never knew that
calling asNumber() on a boolean was wrong.
The fix is super simple: the expression should just check for boolean first.
This bug was benign in release builds. JSValue::asNumber() on a boolean would return
garbage, and that's OK, since we'd take the boolean case anyway.
* dfg/DFGGraph.h:
(JSC::DFG::Graph::addImmediateShouldSpeculateInt32):
LayoutTests:
Unskip now that the bug is fixed.
* TestExpectations:
* js/regress/script-tests/is-string-fold-tricky.js:
* js/regress/script-tests/is-string-fold.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsisstringfoldtrickyjs">trunk/LayoutTests/js/regress/script-tests/is-string-fold-tricky.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsisstringfoldjs">trunk/LayoutTests/js/regress/script-tests/is-string-fold.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphh">trunk/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183649 => 183650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-30 22:57:28 UTC (rev 183649)
+++ trunk/LayoutTests/ChangeLog 2015-04-30 23:02:33 UTC (rev 183650)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-30 Filip Pizlo <fpizlo@apple.com>
+
+ js/regress/is-string-fold-tricky.html and js/regress/is-string-fold.html are crashing
+ https://bugs.webkit.org/show_bug.cgi?id=144463
+
+ Reviewed by Benjamin Poulain.
+
+ Unskip now that the bug is fixed.
+
+ * TestExpectations:
+ * js/regress/script-tests/is-string-fold-tricky.js:
+ * js/regress/script-tests/is-string-fold.js:
+
</ins><span class="cx"> 2015-04-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Javascript using WebSQL can create their own WebKit info table.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (183649 => 183650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-04-30 22:57:28 UTC (rev 183649)
+++ trunk/LayoutTests/TestExpectations 2015-04-30 23:02:33 UTC (rev 183650)
</span><span class="lines">@@ -527,6 +527,3 @@
</span><span class="cx"> webkit.org/b/143778 streams/reference-implementation/readable-stream.html [ Pass Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/144258 [ Debug ] js/class-syntax-semicolon.html [ Skip ]
</span><del>-
-webkit.org/b/144463 js/regress/is-string-fold.html [ Skip ]
-webkit.org/b/144463 js/regress/is-string-fold-tricky.html [ Skip ]
</del></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsisstringfoldtrickyjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/regress/script-tests/is-string-fold-tricky.js (183649 => 183650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/is-string-fold-tricky.js 2015-04-30 22:57:28 UTC (rev 183649)
+++ trunk/LayoutTests/js/regress/script-tests/is-string-fold-tricky.js 2015-04-30 23:02:33 UTC (rev 183650)
</span><span class="lines">@@ -1,6 +1,3 @@
</span><del>-// webkit.org/b/144463
-//@ skip
-
</del><span class="cx"> var object = {};
</span><span class="cx"> (function() {
</span><span class="cx"> var result = 0;
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsisstringfoldjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/regress/script-tests/is-string-fold.js (183649 => 183650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/is-string-fold.js 2015-04-30 22:57:28 UTC (rev 183649)
+++ trunk/LayoutTests/js/regress/script-tests/is-string-fold.js 2015-04-30 23:02:33 UTC (rev 183650)
</span><span class="lines">@@ -1,6 +1,3 @@
</span><del>-// webkit.org/b/144463
-//@ skip
-
</del><span class="cx"> var value1 = "hello";
</span><span class="cx"> var value2 = 42;
</span><span class="cx"> (function() {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183649 => 183650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-30 22:57:28 UTC (rev 183649)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-30 23:02:33 UTC (rev 183650)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-04-30 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ js/regress/is-string-fold-tricky.html and js/regress/is-string-fold.html are crashing
+ https://bugs.webkit.org/show_bug.cgi?id=144463
+
+ Reviewed by Benjamin Poulain.
+
+ Fixup phase was super cleverly folding an IsString(@x) when @x is predicted SpecString
+ into a Check(String:@x) followed by JSConstant(true). Then in these tests the
+ ValueAdd(IsString(@x), @stuff) would try to turn this into an integer add by cleverly
+ converting the boolean into an integer. But as part of doing that, it would try to
+ short-circuit any profiling by leveraging the fact that the IsString is now a constant,
+ and it would try to figure out if the addition might overflow. Part of that logic
+ involved checking if the immediate is either a boolean or a sufficiently small integer.
+ But: it would check if it's a sufficiently small integer before checking if it was a
+ boolean, so it would try to call asNumber() on the boolean.
+
+ All of this cleverness was very deliberate, but apparently the @stuff + booleanConstant
+ case was previously never hit until I wrote these tests, and so we never knew that
+ calling asNumber() on a boolean was wrong.
+
+ The fix is super simple: the expression should just check for boolean first.
+
+ This bug was benign in release builds. JSValue::asNumber() on a boolean would return
+ garbage, and that's OK, since we'd take the boolean case anyway.
+
+ * dfg/DFGGraph.h:
+ (JSC::DFG::Graph::addImmediateShouldSpeculateInt32):
+
+2015-04-30 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Unreviewed, add a FIXME comment referencing https://bugs.webkit.org/show_bug.cgi?id=144458.
</span><span class="cx">
</span><span class="cx"> * jit/JITOperations.cpp:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (183649 => 183650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2015-04-30 22:57:28 UTC (rev 183649)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2015-04-30 23:02:33 UTC (rev 183650)
</span><span class="lines">@@ -889,7 +889,7 @@
</span><span class="cx"> if (operandResultType != NodeResultInt32 && immediateValue.isDouble())
</span><span class="cx"> return DontSpeculateInt32;
</span><span class="cx">
</span><del>- if (jsNumber(immediateValue.asNumber()).isInt32() || immediateValue.isBoolean())
</del><ins>+ if (immediateValue.isBoolean() || jsNumber(immediateValue.asNumber()).isInt32())
</ins><span class="cx"> return add->canSpeculateInt32(source) ? SpeculateInt32 : DontSpeculateInt32;
</span><span class="cx">
</span><span class="cx"> double doubleImmediate = immediateValue.asDouble();
</span></span></pre>
</div>
</div>
</body>
</html>