<!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>[202926] 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/202926">202926</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-07 12:03:27 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Array.prototype.includes uses ToInt32 instead of ToInteger on the index argument
https://bugs.webkit.org/show_bug.cgi?id=159505
Reviewed by Mark Lam.
Source/JavaScriptCore:
The code was using (value)|0 which is effectively a ToInt32.
This fails on large integers and +-Infinity.
Spec: https://tc39.github.io/ecma262/#sec-array.prototype.includes
* builtins/ArrayPrototype.js:
(includes):
LayoutTests:
* js/array-includes-expected.txt:
* js/script-tests/array-includes.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsarrayincludesexpectedtxt">trunk/LayoutTests/js/array-includes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarrayincludesjs">trunk/LayoutTests/js/script-tests/array-includes.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsArrayPrototypejs">trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202925 => 202926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-07 19:00:45 UTC (rev 202925)
+++ trunk/LayoutTests/ChangeLog 2016-07-07 19:03:27 UTC (rev 202926)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-07-07 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><ins>+ [JSC] Array.prototype.includes uses ToInt32 instead of ToInteger on the index argument
+ https://bugs.webkit.org/show_bug.cgi?id=159505
+
+ Reviewed by Mark Lam.
+
+ * js/array-includes-expected.txt:
+ * js/script-tests/array-includes.js:
+
+2016-07-07 Benjamin Poulain <benjamin@webkit.org>
+
</ins><span class="cx"> [JSC] String.prototype.normalize should have a length of zero
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159506
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsarrayincludesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/array-includes-expected.txt (202925 => 202926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-includes-expected.txt 2016-07-07 19:00:45 UTC (rev 202925)
+++ trunk/LayoutTests/js/array-includes-expected.txt 2016-07-07 19:03:27 UTC (rev 202926)
</span><span class="lines">@@ -34,6 +34,37 @@
</span><span class="cx"> PASS var obj = { 0: 1, 1: 1, 2: 1, length: 0 }; Array.prototype.includes.call(obj, 1) is false
</span><span class="cx"> PASS var obj = { 0: 1, 1: 1, 2: 1, length: -0 }; Array.prototype.includes.call(obj, 1) is false
</span><span class="cx"> PASS var obj = { 0: 1, 1: 1, 2: 1, length: -3 }; Array.prototype.includes.call(obj, 1) is false
</span><ins>+The index is converted to integer
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, NaN) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, NaN) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, NaN) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, Infinity) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, Infinity) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, Infinity) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, -Infinity) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, -Infinity) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, -Infinity) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, Number.MAX_SAFE_INTEGER) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, Number.MAX_SAFE_INTEGER) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, Number.MAX_SAFE_INTEGER) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, Number.MAX_SAFE_INTEGER + 1) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, Number.MAX_SAFE_INTEGER + 1) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, Number.MAX_SAFE_INTEGER + 1) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, Number.MIN_SAFE_INTEGER) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, Number.MIN_SAFE_INTEGER) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, Number.MIN_SAFE_INTEGER) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, Number.MIN_SAFE_INTEGER - 1) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, Number.MIN_SAFE_INTEGER - 1) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, Number.MIN_SAFE_INTEGER - 1) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, { valueOf: () => { return 1; } }) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, { valueOf: () => { return 1; } }) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, { valueOf: () => { return 1; } }) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, { toString: () => { return '1'; } }) is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, { toString: () => { return '1'; } }) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, { toString: () => { return '1'; } }) is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(2, '1') is false
+PASS [2, 3, 5, 7, 11, 13, 17].includes(7, '1') is true
+PASS [2, 3, 5, 7, 11, 13, 17].includes(17, '1') is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarrayincludesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/array-includes.js (202925 => 202926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/array-includes.js 2016-07-07 19:00:45 UTC (rev 202925)
+++ trunk/LayoutTests/js/script-tests/array-includes.js 2016-07-07 19:03:27 UTC (rev 202926)
</span><span class="lines">@@ -47,3 +47,38 @@
</span><span class="cx"> shouldBeFalse("var obj = { 0: 1, 1: 1, 2: 1, length: 0 }; Array.prototype.includes.call(obj, 1)");
</span><span class="cx"> shouldBeFalse("var obj = { 0: 1, 1: 1, 2: 1, length: -0 }; Array.prototype.includes.call(obj, 1)");
</span><span class="cx"> shouldBeFalse("var obj = { 0: 1, 1: 1, 2: 1, length: -3 }; Array.prototype.includes.call(obj, 1)");
</span><ins>+
+debug("The index is converted to integer");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(2, NaN)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(7, NaN)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(17, NaN)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(2, Infinity)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(7, Infinity)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(17, Infinity)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(2, -Infinity)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(7, -Infinity)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(17, -Infinity)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(2, Number.MAX_SAFE_INTEGER)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(7, Number.MAX_SAFE_INTEGER)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(17, Number.MAX_SAFE_INTEGER)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(2, Number.MAX_SAFE_INTEGER + 1)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(7, Number.MAX_SAFE_INTEGER + 1)");
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(17, Number.MAX_SAFE_INTEGER + 1)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(2, Number.MIN_SAFE_INTEGER)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(7, Number.MIN_SAFE_INTEGER)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(17, Number.MIN_SAFE_INTEGER)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(2, Number.MIN_SAFE_INTEGER - 1)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(7, Number.MIN_SAFE_INTEGER - 1)");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(17, Number.MIN_SAFE_INTEGER - 1)");
+
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(2, { valueOf: () => { return 1; } })");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(7, { valueOf: () => { return 1; } })");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(17, { valueOf: () => { return 1; } })");
+
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(2, { toString: () => { return '1'; } })");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(7, { toString: () => { return '1'; } })");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(17, { toString: () => { return '1'; } })");
+
+shouldBeFalse("[2, 3, 5, 7, 11, 13, 17].includes(2, '1')");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(7, '1')");
+shouldBeTrue("[2, 3, 5, 7, 11, 13, 17].includes(17, '1')");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202925 => 202926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-07 19:00:45 UTC (rev 202925)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-07 19:03:27 UTC (rev 202926)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-07-07 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><ins>+ [JSC] Array.prototype.includes uses ToInt32 instead of ToInteger on the index argument
+ https://bugs.webkit.org/show_bug.cgi?id=159505
+
+ Reviewed by Mark Lam.
+
+ The code was using (value)|0 which is effectively a ToInt32.
+ This fails on large integers and +-Infinity.
+
+ Spec: https://tc39.github.io/ecma262/#sec-array.prototype.includes
+
+ * builtins/ArrayPrototype.js:
+ (includes):
+
+2016-07-07 Benjamin Poulain <benjamin@webkit.org>
+
</ins><span class="cx"> [JSC] String.prototype.normalize should have a length of zero
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159506
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js (202925 => 202926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js 2016-07-07 19:00:45 UTC (rev 202925)
+++ trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js 2016-07-07 19:03:27 UTC (rev 202926)
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx">
</span><span class="cx"> var fromIndex = 0;
</span><span class="cx"> if (arguments.length > 1 && arguments[1] !== @undefined)
</span><del>- fromIndex = arguments[1] | 0;
</del><ins>+ fromIndex = @toInteger(arguments[1]);
</ins><span class="cx">
</span><span class="cx"> var index;
</span><span class="cx"> if (fromIndex >= 0)
</span></span></pre>
</div>
</div>
</body>
</html>