<!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>[201301] 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/201301">201301</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-05-23 15:46:41 -0700 (Mon, 23 May 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>The baseline JIT crashes when compiling &quot;(1,1)/1&quot;
https://bugs.webkit.org/show_bug.cgi?id=157933

Reviewed by Benjamin Poulain.

op_div in the baseline JIT needed to better handle when both the lhs
and rhs are constants. It needs to make sure to load either the lhs or
the rhs into a register since the div generator can't handle both
the lhs and rhs being constants.

* jit/JITArithmetic.cpp:
(JSC::JIT::emit_op_div):
* tests/stress/jit-gracefully-handle-double-constants-in-math-operators.js: Added.
(assert):
(test):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITArithmeticcpp">trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressjitgracefullyhandledoubleconstantsinmathoperatorsjs">trunk/Source/JavaScriptCore/tests/stress/jit-gracefully-handle-double-constants-in-math-operators.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201300 => 201301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-05-23 22:37:52 UTC (rev 201300)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-05-23 22:46:41 UTC (rev 201301)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-05-23  Saam barati  &lt;sbarati@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        The baseline JIT crashes when compiling &quot;(1,1)/1&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=157933
+
+        Reviewed by Benjamin Poulain.
+
+        op_div in the baseline JIT needed to better handle when both the lhs
+        and rhs are constants. It needs to make sure to load either the lhs or
+        the rhs into a register since the div generator can't handle both
+        the lhs and rhs being constants.
+
+        * jit/JITArithmetic.cpp:
+        (JSC::JIT::emit_op_div):
+        * tests/stress/jit-gracefully-handle-double-constants-in-math-operators.js: Added.
+        (assert):
+        (test):
+
+2016-05-23  Saam barati  &lt;sbarati@apple.com&gt;
+
</ins><span class="cx">         String template don't handle let initialization properly inside eval
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=157991
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITArithmeticcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp (201300 => 201301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp        2016-05-23 22:37:52 UTC (rev 201300)
+++ trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp        2016-05-23 22:46:41 UTC (rev 201301)
</span><span class="lines">@@ -816,8 +816,7 @@
</span><span class="cx">     else if (isOperandConstantDouble(op1))
</span><span class="cx">         leftOperand.setConstDouble(getOperandConstantDouble(op1));
</span><span class="cx"> #endif
</span><del>-
-    if (isOperandConstantInt(op2))
</del><ins>+    else if (isOperandConstantInt(op2))
</ins><span class="cx">         rightOperand.setConstInt32(getOperandConstantInt(op2));
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx">     else if (isOperandConstantDouble(op2))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressjitgracefullyhandledoubleconstantsinmathoperatorsjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/jit-gracefully-handle-double-constants-in-math-operators.js (0 => 201301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/jit-gracefully-handle-double-constants-in-math-operators.js                                (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/jit-gracefully-handle-double-constants-in-math-operators.js        2016-05-23 22:46:41 UTC (rev 201301)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+function assert(b) {
+    if (!b)
+        throw new Error(&quot;bad assertion!&quot;);
+}
+
+
+function test() {
+    let cases = [
+        [&quot;/&quot;, 1],
+        [&quot;*&quot;, 1],
+        [&quot;+&quot;, 2],
+        [&quot;-&quot;, 0],
+        [&quot;&gt;&gt;&quot;, 0],
+        [&quot;&gt;&gt;&gt;&quot;, 0],
+        [&quot;&lt;&lt;&quot;, 2],
+        [&quot;^&quot;, 0],
+        [&quot;&amp;&quot;, 1],
+    ];
+
+    for (let [op, result] of cases) {
+        let program = `for (let i = 0; i &lt; 500; i++) { assert((1,1)${op}1 === ${result}); }`;
+        eval(program);
+    }
+}
+test();
</ins></span></pre>
</div>
</div>

</body>
</html>