<!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>[203360] 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/203360">203360</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-18 12:12:24 -0700 (Mon, 18 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/203351">r203351</a>. rdar://problem/27327111</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreruntimeJSGenericTypedArrayViewPrototypeFunctionsh">branches/safari-602-branch/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoretestsstresstypedarraysubarrayjs">branches/safari-602-branch/Source/JavaScriptCore/tests/stress/typedarray-subarray.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 (203359 => 203360)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-07-18 19:07:09 UTC (rev 203359)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-07-18 19:12:24 UTC (rev 203360)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-07-18 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203351.
+
+ 2016-07-18 Keith Miller <keith_miller@apple.com>
+
+ Fix bad assertions in genericTypedArrayViewPrivateFuncSubarrayCreate
+ https://bugs.webkit.org/show_bug.cgi?id=159882
+ <rdar://problem/27327111>
+
+ Reviewed by Mark Lam.
+
+ According the spec toInteger can return values we don't consider ints.
+ Such as, -0 and +/-Infinity. This broke some assertions in
+ genericTypedArrayViewPrivateFuncSubarrayCreate.
+
+ * runtime/JSGenericTypedArrayViewPrototypeFunctions.h:
+ (JSC::genericTypedArrayViewPrivateFuncSubarrayCreate):
+ * tests/stress/typedarray-subarray.js:
+
+2016-07-18 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge patch for rdar://problem/27360961.
</span><span class="cx">
</span><span class="cx"> 2016-06-23 Dean Jackson <dino@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreruntimeJSGenericTypedArrayViewPrototypeFunctionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h (203359 => 203360)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h 2016-07-18 19:07:09 UTC (rev 203359)
+++ branches/safari-602-branch/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h 2016-07-18 19:12:24 UTC (rev 203360)
</span><span class="lines">@@ -496,8 +496,11 @@
</span><span class="cx"> // Get the length here; later assert that the length didn't change.
</span><span class="cx"> unsigned thisLength = thisObject->length();
</span><span class="cx">
</span><del>- ASSERT(exec->argument(0).isAnyInt());
- ASSERT(exec->argument(1).isUndefined() || exec->argument(1).isAnyInt());
</del><ins>+ // I would assert that the arguments are integers here but that's not true since
+ // https://tc39.github.io/ecma262/#sec-tointeger allows the result of the operation
+ // to be +/- Infinity and -0.
+ ASSERT(exec->argument(0).isNumber());
+ ASSERT(exec->argument(1).isUndefined() || exec->argument(1).isNumber());
</ins><span class="cx"> unsigned begin = argumentClampedIndexFromStartOrEnd(exec, 0, thisLength);
</span><span class="cx"> ASSERT(!vm.exception());
</span><span class="cx"> unsigned end = argumentClampedIndexFromStartOrEnd(exec, 1, thisLength, thisLength);
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoretestsstresstypedarraysubarrayjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/tests/stress/typedarray-subarray.js (203359 => 203360)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/tests/stress/typedarray-subarray.js 2016-07-18 19:07:09 UTC (rev 203359)
+++ branches/safari-602-branch/Source/JavaScriptCore/tests/stress/typedarray-subarray.js 2016-07-18 19:12:24 UTC (rev 203360)
</span><span class="lines">@@ -58,4 +58,21 @@
</span><span class="cx">
</span><span class="cx"> shouldBeTrue("forEachTypedArray(subclasses, testSpeciesRemoveConstructor)");
</span><span class="cx">
</span><ins>+debug("5.0 Coercion First Argument");
+shouldBeTrue("testPrototypeFunction('subarray', '(true)', [1, 2, 3, 4], [2, 3, 4])");
+shouldBeTrue("testPrototypeFunction('subarray', '(\"abc\")', [1, 2, 3, 4], [1, 2, 3, 4])");
+shouldBeTrue("testPrototypeFunction('subarray', '({ valueOf() { return Infinity; } })', [1, 2, 3, 4], [])");
+shouldBeTrue("testPrototypeFunction('subarray', '({ valueOf() { return -0; } })', [1, 2, 3, 4], [1, 2, 3, 4])");
+shouldBeTrue("testPrototypeFunction('subarray', '(null)', [1, 2, 3, 4], [1, 2, 3, 4])");
+shouldBeTrue("testPrototypeFunction('subarray', '(undefined)', [1, 2, 3, 4], [1, 2, 3, 4])");
+
+debug("5.1 Coercion Second Argument");
+shouldBeTrue("testPrototypeFunction('subarray', '(0, true)', [1, 2, 3, 4], [1])");
+shouldBeTrue("testPrototypeFunction('subarray', '(0, \"abc\")', [1, 2, 3, 4], [])");
+shouldBeTrue("testPrototypeFunction('subarray', '(0, \"1\")', [1, 2, 3, 4], [1])");
+shouldBeTrue("testPrototypeFunction('subarray', '(0, undefined)', [1, 2, 3, 4], [1, 2, 3, 4])");
+shouldBeTrue("testPrototypeFunction('subarray', '(0, { valueOf() { return Infinity; } })', [1, 2, 3, 4], [1, 2, 3, 4])");
+shouldBeTrue("testPrototypeFunction('subarray', '(0, { valueOf() { return -0; } })', [1, 2, 3, 4], [])");
+shouldBeTrue("testPrototypeFunction('subarray', '(0, null)', [1, 2, 3, 4], [])");
+
</ins><span class="cx"> finishJSTest();
</span></span></pre>
</div>
</div>
</body>
</html>