<!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>[203894] branches/safari-602-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/203894">203894</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 00:13:04 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203851">r203851</a>. rdar://problem/27299339</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreassemblerMacroAssemblerARM64h">branches/safari-602-branch/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceJavaScriptCoretestsstressregress160329js">branches/safari-602-branch/Source/JavaScriptCore/tests/stress/regress-160329.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (203893 => 203894)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-07-29 07:13:01 UTC (rev 203893)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-07-29 07:13:04 UTC (rev 203894)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203851. rdar://problem/27299339
+
+ 2016-07-28 Michael Saboff <msaboff@apple.com>
+
+ ARM64: Fused left shift with a right shift can create NaNs from integers
+ https://bugs.webkit.org/show_bug.cgi?id=160329
+
+ Reviewed by Geoffrey Garen.
+
+ When we fuse a left shift and a right shift of integers where the shift amounts
+ are the same and the size of the quantity being shifted is 8 bits, we rightly
+ generate a sign extend byte instruction. On ARM64, we were sign extending
+ to a 64 bit quantity, when we really wanted to sign extend to a 32 bit quantity.
+
+ Checking the ARM64 marco assembler and we were extending to 64 bits for all
+ four combinations of zero / sign and 8 / 16 bits.
+
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::zeroExtend16To32):
+ (JSC::MacroAssemblerARM64::signExtend16To32):
+ (JSC::MacroAssemblerARM64::zeroExtend8To32):
+ (JSC::MacroAssemblerARM64::signExtend8To32):
+ * tests/stress/regress-160329.js: New test added.
+ (narrow):
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203793. rdar://problem/27572612
</span><span class="cx">
</span><span class="cx"> 2016-07-27 Saam Barati <sbarati@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (203893 => 203894)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-07-29 07:13:01 UTC (rev 203893)
+++ branches/safari-602-branch/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-07-29 07:13:04 UTC (rev 203894)
</span><span class="lines">@@ -1122,12 +1122,12 @@
</span><span class="cx">
</span><span class="cx"> void zeroExtend16To32(RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- m_assembler.uxth<64>(dest, src);
</del><ins>+ m_assembler.uxth<32>(dest, src);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void signExtend16To32(RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- m_assembler.sxth<64>(dest, src);
</del><ins>+ m_assembler.sxth<32>(dest, src);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void load8(ImplicitAddress address, RegisterID dest)
</span><span class="lines">@@ -1187,12 +1187,12 @@
</span><span class="cx">
</span><span class="cx"> void zeroExtend8To32(RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- m_assembler.uxtb<64>(dest, src);
</del><ins>+ m_assembler.uxtb<32>(dest, src);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void signExtend8To32(RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- m_assembler.sxtb<64>(dest, src);
</del><ins>+ m_assembler.sxtb<32>(dest, src);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void store64(RegisterID src, ImplicitAddress address)
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoretestsstressregress160329js"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/Source/JavaScriptCore/tests/stress/regress-160329.js (0 => 203894)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/tests/stress/regress-160329.js (rev 0)
+++ branches/safari-602-branch/Source/JavaScriptCore/tests/stress/regress-160329.js 2016-07-29 07:13:04 UTC (rev 203894)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+// Regression test for 160329. This test should not crash or throw an exception.
+
+function narrow(x) {
+ return x << 24 >> 24;
+}
+
+noInline(narrow);
+
+for (var i = 0; i < 1000000; i++) {
+ let expected = i << 24;
+ let got = narrow(i);
+ expected = expected >> 24;
+
+ if (expected != got)
+ throw "FAILURE, expected:" + expected + ", got:" + got;
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>