<!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>[38590] 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/38590">38590</a></dd>
<dt>Author</dt> <dd>cwzwarich@webkit.org</dd>
<dt>Date</dt> <dd>2008-11-18 20:04:01 -0800 (Tue, 18 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-11-18  Cameron Zwarich  &lt;zwarich@apple.com&gt;

        Reviewed by Maciej Stachowiak and Geoff Garen.

        Bug 22287: ASSERTION FAILED: Not enough jumps linked in slow case codegen in CTI::privateCompileSlowCases())
        &lt;https://bugs.webkit.org/show_bug.cgi?id=22287&gt;

        Fix a typo in the number cell reuse code where the first and second
        operands are sometimes confused.

        JavaScriptcore:

        * jit/JIT.cpp:
        (JSC::JIT::compileBinaryArithOpSlowCase):

        LayoutTests:

        * fast/js/number-cell-reuse-expected.txt: Added.
        * fast/js/number-cell-reuse.html: Added.
        * fast/js/resources/number-cell-reuse.js: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorejitJITcpp">trunk/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastjsnumbercellreuseexpectedtxt">trunk/LayoutTests/fast/js/number-cell-reuse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastjsnumbercellreusehtml">trunk/LayoutTests/fast/js/number-cell-reuse.html</a></li>
<li><a href="#trunkLayoutTestsfastjsresourcesnumbercellreusejs">trunk/LayoutTests/fast/js/resources/number-cell-reuse.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (38589 => 38590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2008-11-19 01:58:39 UTC (rev 38589)
+++ trunk/JavaScriptCore/ChangeLog        2008-11-19 04:04:01 UTC (rev 38590)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2008-11-18  Cameron Zwarich  &lt;zwarich@apple.com&gt;
+
+        Reviewed by Maciej Stachowiak and Geoff Garen.
+
+        Bug 22287: ASSERTION FAILED: Not enough jumps linked in slow case codegen in CTI::privateCompileSlowCases())
+        &lt;https://bugs.webkit.org/show_bug.cgi?id=22287&gt;
+
+        Fix a typo in the number cell reuse code where the first and second
+        operands are sometimes confused.
+
+        * jit/JIT.cpp:
+        (JSC::JIT::compileBinaryArithOpSlowCase):
+
</ins><span class="cx"> 2008-11-18  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         - try to fix the Windows build
</span></span></pre></div>
<a id="trunkJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/jit/JIT.cpp (38589 => 38590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/jit/JIT.cpp        2008-11-19 01:58:39 UTC (rev 38589)
+++ trunk/JavaScriptCore/jit/JIT.cpp        2008-11-19 04:04:01 UTC (rev 38590)
</span><span class="lines">@@ -1045,12 +1045,12 @@
</span><span class="cx">     __ link(iter-&gt;from, here);
</span><span class="cx">     if (types.second().isReusable() &amp;&amp; isSSE2Present()) {
</span><span class="cx">         if (!types.first().definitelyIsNumber()) {
</span><del>-            if (linkSlowCaseIfNotJSCell(++iter, src2))
</del><ins>+            if (linkSlowCaseIfNotJSCell(++iter, src1))
</ins><span class="cx">                 ++iter;
</span><span class="cx">             __ link(iter-&gt;from, here);
</span><span class="cx">         }
</span><span class="cx">         if (!types.second().definitelyIsNumber()) {
</span><del>-            if (linkSlowCaseIfNotJSCell(++iter, src1))
</del><ins>+            if (linkSlowCaseIfNotJSCell(++iter, src2))
</ins><span class="cx">                 ++iter;
</span><span class="cx">             __ link(iter-&gt;from, here);
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (38589 => 38590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-11-19 01:58:39 UTC (rev 38589)
+++ trunk/LayoutTests/ChangeLog        2008-11-19 04:04:01 UTC (rev 38590)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2008-11-18  Cameron Zwarich  &lt;zwarich@apple.com&gt;
+
+        Reviewed by Maciej Stachowiak and Geoff Garen.
+
+        Add tests for bug 22287: ASSERTION FAILED: Not enough jumps linked in slow case codegen in CTI::privateCompileSlowCases())
+        &lt;https://bugs.webkit.org/show_bug.cgi?id=22287&gt;
+
+        * fast/js/number-cell-reuse-expected.txt: Added.
+        * fast/js/number-cell-reuse.html: Added.
+        * fast/js/resources/number-cell-reuse.js: Added.
+
</ins><span class="cx"> 2008-11-18  Holger Hans Peter Freyther  &lt;zecke@selfish.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Rubber-stamped by Mark Rowe.
</span></span></pre></div>
<a id="trunkLayoutTestsfastjsnumbercellreuseexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/js/number-cell-reuse-expected.txt (0 => 38590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/js/number-cell-reuse-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/js/number-cell-reuse-expected.txt        2008-11-19 04:04:01 UTC (rev 38590)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+This test checks corner cases of the number cell reuse code. In particular, it checks for known cases where code generation for number cell reuse caused assertions to fail.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS leftConstantRightSimple(2) is 0.4
+PASS leftConstantRightComplex(1) is 0.2
+PASS leftSimpleRightConstant(2) is 0.4
+PASS leftComplexRightConstant(1) is 0.2
+PASS leftThisRightSimple(2) is NaN
+PASS leftThisRightSimple.call(2, 2) is 8
+PASS leftThisRightComplex(2) is NaN
+PASS leftThisRightComplex.call(2, 2) is 12
+PASS leftSimpleRightThis(2) is NaN
+PASS leftSimpleRightThis.call(2, 2) is 8
+PASS leftComplexRightThis(2) is NaN
+PASS leftComplexRightThis.call(2, 2) is 12
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastjsnumbercellreusehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/js/number-cell-reuse.html (0 => 38590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/js/number-cell-reuse.html                                (rev 0)
+++ trunk/LayoutTests/fast/js/number-cell-reuse.html        2008-11-19 04:04:01 UTC (rev 38590)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+&lt;!DOCTYPE HTML PUBLIC &quot;-//IETF//DTD HTML//EN&quot;&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;link rel=&quot;stylesheet&quot; href=&quot;resources/js-test-style.css&quot;&gt;
+&lt;script src=&quot;resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;p id=&quot;description&quot;&gt;&lt;/p&gt;
+&lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
+&lt;script src=&quot;resources/number-cell-reuse.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastjsresourcesnumbercellreusejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/js/resources/number-cell-reuse.js (0 => 38590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/js/resources/number-cell-reuse.js                                (rev 0)
+++ trunk/LayoutTests/fast/js/resources/number-cell-reuse.js        2008-11-19 04:04:01 UTC (rev 38590)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+description(
+&quot;This test checks corner cases of the number cell reuse code. In particular, it checks for known cases where code generation for number cell reuse caused assertions to fail.&quot;
+);
+
+function leftConstantRightSimple(a)
+{
+    return 0.1 * (a * a);
+}
+
+shouldBe(&quot;leftConstantRightSimple(2)&quot;, &quot;0.4&quot;);
+
+function leftConstantRightComplex(a)
+{
+    return 0.1 * (a * a + a);
+}
+
+shouldBe(&quot;leftConstantRightComplex(1)&quot;, &quot;0.2&quot;);
+
+function leftSimpleRightConstant(a)
+{
+    return (a * a) * 0.1;
+}
+
+shouldBe(&quot;leftSimpleRightConstant(2)&quot;, &quot;0.4&quot;);
+
+function leftComplexRightConstant(a)
+{
+    return (a * a + a) * 0.1;
+}
+
+shouldBe(&quot;leftComplexRightConstant(1)&quot;, &quot;0.2&quot;);
+
+function leftThisRightSimple(a)
+{
+    return this * (a * a);
+}
+
+shouldBeNaN(&quot;leftThisRightSimple(2)&quot;);
+shouldBe(&quot;leftThisRightSimple.call(2, 2)&quot;, &quot;8&quot;);
+
+function leftThisRightComplex(a)
+{
+    return this * (a * a + a);
+}
+
+shouldBeNaN(&quot;leftThisRightComplex(2)&quot;);
+shouldBe(&quot;leftThisRightComplex.call(2, 2)&quot;, &quot;12&quot;);
+
+function leftSimpleRightThis(a)
+{
+    return (a * a) * this;
+}
+
+shouldBeNaN(&quot;leftSimpleRightThis(2)&quot;);
+shouldBe(&quot;leftSimpleRightThis.call(2, 2)&quot;, &quot;8&quot;);
+
+function leftComplexRightThis(a)
+{
+    return (a * a + a) * this;
+}
+
+shouldBeNaN(&quot;leftComplexRightThis(2)&quot;);
+shouldBe(&quot;leftComplexRightThis.call(2, 2)&quot;, &quot;12&quot;);
+
+var successfullyParsed = true;
</ins></span></pre>
</div>
</div>

</body>
</html>