<!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>[184848] 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/184848">184848</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-24 20:51:17 -0700 (Sun, 24 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Array#findIndex/find should not skip holes
https://bugs.webkit.org/show_bug.cgi?id=145361
Source/JavaScriptCore:
per https://people.mozilla.org/~jorendorff/es6-draft.html#sec-array.prototype.findindex
and https://people.mozilla.org/~jorendorff/es6-draft.html#sec-array.prototype.find
Patch by Jordan Harband <ljharb@gmail.com> on 2015-05-24
Reviewed by Yusuke Suzuki.
* builtins/Array.prototype.js:
(find): Deleted.
(findIndex): Deleted.
LayoutTests:
Patch by Jordan Harband <ljharb@gmail.com> on 2015-05-24
Reviewed by Yusuke Suzuki.
* js/array-find-expected.txt:
* js/array-findIndex-expected.txt:
* js/script-tests/array-find.js:
* js/script-tests/array-findIndex.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsarrayfindexpectedtxt">trunk/LayoutTests/js/array-find-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsarrayfindIndexexpectedtxt">trunk/LayoutTests/js/array-findIndex-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarrayfindjs">trunk/LayoutTests/js/script-tests/array-find.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarrayfindIndexjs">trunk/LayoutTests/js/script-tests/array-findIndex.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsArrayprototypejs">trunk/Source/JavaScriptCore/builtins/Array.prototype.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184847 => 184848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-25 02:38:22 UTC (rev 184847)
+++ trunk/LayoutTests/ChangeLog 2015-05-25 03:51:17 UTC (rev 184848)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-24 Jordan Harband <ljharb@gmail.com>
+
+ Array#findIndex/find should not skip holes
+ https://bugs.webkit.org/show_bug.cgi?id=145361
+
+ Reviewed by Yusuke Suzuki.
+
+ * js/array-find-expected.txt:
+ * js/array-findIndex-expected.txt:
+ * js/script-tests/array-find.js:
+ * js/script-tests/array-findIndex.js:
+
</ins><span class="cx"> 2015-05-23 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Permanent redirects should have long implicit cache lifetime
</span></span></pre></div>
<a id="trunkLayoutTestsjsarrayfindexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/array-find-expected.txt (184847 => 184848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-find-expected.txt 2015-05-25 02:38:22 UTC (rev 184847)
+++ trunk/LayoutTests/js/array-find-expected.txt 2015-05-25 03:51:17 UTC (rev 184848)
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx"> PASS [undefined, 0, null, ''].find(passFalse) is undefined
</span><span class="cx"> PASS [undefined, 0, null, false].find(passEmptyString) is undefined
</span><span class="cx"> PASS [undefined, null, false, ''].find(passZero) is undefined
</span><ins>+Array with holes
</ins><span class="cx"> PASS (new Array(20)).find(passUndefined) is undefined
</span><del>-Array with holes
</del><span class="cx"> PASS arrayWithHoles.find(passUndefined) is undefined
</span><span class="cx"> PASS arrayWithHoles.find(passZero) is 0
</span><span class="cx"> PASS arrayWithHoles.find(passNull) is null
</span><span class="lines">@@ -50,13 +50,16 @@
</span><span class="cx"> PASS [].find({}) threw exception TypeError: Array.prototype.find callback must be a function.
</span><span class="cx"> PASS [].find(null) threw exception TypeError: Array.prototype.find callback must be a function.
</span><span class="cx"> PASS [].find(undefined) threw exception TypeError: Array.prototype.find callback must be a function.
</span><del>-Callbacks in the expected order and skipping holes
-find callback called with index 10
-find callback called with index 20
-find callback called with index 30
-find callback called with index 40
-find callback called with index 50
-PASS numberOfCallbacksInFindInArrayWithHoles() is 5
</del><ins>+Callbacks in the expected order and *not* skipping holes
+find callback called with index 0
+find callback called with index 1
+find callback called with index 2
+find callback called with index 3
+find callback called with index 4
+find callback called with index 5
+find callback called with index 6
+find callback called with index 7
+PASS numberOfCallbacksInFindInArrayWithHoles() is 8
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsarrayfindIndexexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/array-findIndex-expected.txt (184847 => 184848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-findIndex-expected.txt 2015-05-25 02:38:22 UTC (rev 184847)
+++ trunk/LayoutTests/js/array-findIndex-expected.txt 2015-05-25 03:51:17 UTC (rev 184848)
</span><span class="lines">@@ -15,14 +15,14 @@
</span><span class="cx"> PASS [undefined, 0, null, ''].findIndex(passFalse) is -1
</span><span class="cx"> PASS [undefined, 0, null, false].findIndex(passEmptyString) is -1
</span><span class="cx"> PASS [undefined, null, false, ''].findIndex(passZero) is -1
</span><del>-PASS (new Array(20)).findIndex(passUndefined) is -1
</del><span class="cx"> Array with holes
</span><del>-PASS arrayWithHoles.findIndex(passUndefined) is -1
-PASS arrayWithHoles.findIndex(passZero) is 10
-PASS arrayWithHoles.findIndex(passNull) is 20
-PASS arrayWithHoles.findIndex(passFalse) is 30
-PASS arrayWithHoles.findIndex(passEmptyString) is 40
-PASS arrayWithHoles.findIndex(passUndefined) is 50
</del><ins>+PASS (new Array(20)).findIndex(passUndefined) is 0
+PASS arrayWithHoles.findIndex(passUndefined) is 0
+PASS arrayWithHoles.findIndex(passZero) is 1
+PASS arrayWithHoles.findIndex(passNull) is 3
+PASS arrayWithHoles.findIndex(passFalse) is 5
+PASS arrayWithHoles.findIndex(passEmptyString) is 7
+PASS arrayWithHoles.findIndex(passUndefined) is 2
</ins><span class="cx"> Generic Object
</span><span class="cx"> PASS toObject([undefined, 0, null, false, '']).findIndex(passUndefined) is 0
</span><span class="cx"> PASS toObject([undefined, 0, null, false, '']).findIndex(passZero) is 1
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> PASS toObject([undefined, 0, null, '']).findIndex(passFalse) is -1
</span><span class="cx"> PASS toObject([undefined, 0, null, false]).findIndex(passEmptyString) is -1
</span><span class="cx"> PASS toObject([undefined, null, false, '']).findIndex(passZero) is -1
</span><del>-PASS toObject(new Array(20)).findIndex(passUndefined) is -1
</del><ins>+PASS toObject(new Array(20)).findIndex(passUndefined) is 0
</ins><span class="cx"> Array-like object with invalid lengths
</span><span class="cx"> PASS var obj = { 0: 1, 1: 2, 2: 3, length: 0 }; Array.prototype.findIndex.call(obj, throwError) is -1
</span><span class="cx"> PASS var obj = { 0: 1, 1: 2, 2: 3, length: -0 }; Array.prototype.findIndex.call(obj, throwError) is -1
</span><span class="lines">@@ -51,13 +51,16 @@
</span><span class="cx"> PASS [].findIndex({}) threw exception TypeError: Array.prototype.findIndex callback must be a function.
</span><span class="cx"> PASS [].findIndex(null) threw exception TypeError: Array.prototype.findIndex callback must be a function.
</span><span class="cx"> PASS [].findIndex(undefined) threw exception TypeError: Array.prototype.findIndex callback must be a function.
</span><del>-Callbacks in the expected order and skipping holes
-find callback called with index 10
-find callback called with index 20
-find callback called with index 30
-find callback called with index 40
-find callback called with index 50
-PASS numberOfCallbacksInFindIndexInArrayWithHoles() is 5
</del><ins>+Callbacks in the expected order and *not* skipping holes
+find callback called with index 0
+find callback called with index 1
+find callback called with index 2
+find callback called with index 3
+find callback called with index 4
+find callback called with index 5
+find callback called with index 6
+find callback called with index 7
+PASS numberOfCallbacksInFindIndexInArrayWithHoles() is 8
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarrayfindjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/array-find.js (184847 => 184848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/array-find.js 2015-05-25 02:38:22 UTC (rev 184847)
+++ trunk/LayoutTests/js/script-tests/array-find.js 2015-05-25 03:51:17 UTC (rev 184848)
</span><span class="lines">@@ -43,11 +43,10 @@
</span><span class="cx"> return (index === 0 && array[0] === element);
</span><span class="cx"> }
</span><span class="cx"> arrayWithHoles = [];
</span><del>-arrayWithHoles[10] = 0;
-arrayWithHoles[20] = null;
-arrayWithHoles[30] = false;
-arrayWithHoles[40] = "";
-arrayWithHoles[50] = undefined;
</del><ins>+arrayWithHoles[1] = 0;
+arrayWithHoles[3] = null;
+arrayWithHoles[5] = false;
+arrayWithHoles[7] = "";
</ins><span class="cx"> function numberOfCallbacksInFindInArrayWithHoles() {
</span><span class="cx"> var count = 0;
</span><span class="cx"> arrayWithHoles.find(function(element, index, array) {
</span><span class="lines">@@ -67,9 +66,9 @@
</span><span class="cx"> shouldBe("[undefined, 0, null, ''].find(passFalse)", "undefined");
</span><span class="cx"> shouldBe("[undefined, 0, null, false].find(passEmptyString)", "undefined");
</span><span class="cx"> shouldBe("[undefined, null, false, ''].find(passZero)", "undefined");
</span><del>-shouldBe("(new Array(20)).find(passUndefined)", "undefined");
</del><span class="cx">
</span><span class="cx"> debug("Array with holes")
</span><ins>+shouldBe("(new Array(20)).find(passUndefined)", "undefined");
</ins><span class="cx"> shouldBe("arrayWithHoles.find(passUndefined)", "undefined");
</span><span class="cx"> shouldBe("arrayWithHoles.find(passZero)", "0");
</span><span class="cx"> shouldBe("arrayWithHoles.find(passNull)", "null");
</span><span class="lines">@@ -111,5 +110,5 @@
</span><span class="cx"> shouldThrow("[].find(null)", "'TypeError: Array.prototype.find callback must be a function'");
</span><span class="cx"> shouldThrow("[].find(undefined)", "'TypeError: Array.prototype.find callback must be a function'");
</span><span class="cx">
</span><del>-debug("Callbacks in the expected order and skipping holes");
-shouldBe("numberOfCallbacksInFindInArrayWithHoles()", "5");
</del><ins>+debug("Callbacks in the expected order and *not* skipping holes");
+shouldBe("numberOfCallbacksInFindInArrayWithHoles()", "8");
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarrayfindIndexjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/array-findIndex.js (184847 => 184848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/array-findIndex.js 2015-05-25 02:38:22 UTC (rev 184847)
+++ trunk/LayoutTests/js/script-tests/array-findIndex.js 2015-05-25 03:51:17 UTC (rev 184848)
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> array.shift();
</span><span class="cx"> return (index === 0 && array[0] === element);
</span><span class="cx"> }
</span><del>-arrayWithHoles = [];
-arrayWithHoles[10] = 0;
-arrayWithHoles[20] = null;
-arrayWithHoles[30] = false;
-arrayWithHoles[40] = "";
</del><ins>+var arrayWithHoles = [];
+arrayWithHoles[1] = 0;
+arrayWithHoles[3] = null;
+arrayWithHoles[5] = false;
+arrayWithHoles[7] = "";
</ins><span class="cx"> function numberOfCallbacksInFindIndexInArrayWithHoles() {
</span><span class="cx"> var count = 0;
</span><span class="cx"> arrayWithHoles.find(function(element, index, array) {
</span><span class="lines">@@ -66,16 +66,16 @@
</span><span class="cx"> shouldBe("[undefined, 0, null, ''].findIndex(passFalse)", "-1");
</span><span class="cx"> shouldBe("[undefined, 0, null, false].findIndex(passEmptyString)", "-1");
</span><span class="cx"> shouldBe("[undefined, null, false, ''].findIndex(passZero)", "-1");
</span><del>-shouldBe("(new Array(20)).findIndex(passUndefined)", "-1");
</del><span class="cx">
</span><span class="cx"> debug("Array with holes");
</span><del>-shouldBe("arrayWithHoles.findIndex(passUndefined)", "-1");
-shouldBe("arrayWithHoles.findIndex(passZero)", "10");
-shouldBe("arrayWithHoles.findIndex(passNull)", "20");
-shouldBe("arrayWithHoles.findIndex(passFalse)", "30");
-shouldBe("arrayWithHoles.findIndex(passEmptyString)", "40");
-arrayWithHoles[50] = undefined;
-shouldBe("arrayWithHoles.findIndex(passUndefined)", "50");
</del><ins>+shouldBe("(new Array(20)).findIndex(passUndefined)", "0");
+shouldBe("arrayWithHoles.findIndex(passUndefined)", "0");
+shouldBe("arrayWithHoles.findIndex(passZero)", "1");
+shouldBe("arrayWithHoles.findIndex(passNull)", "3");
+shouldBe("arrayWithHoles.findIndex(passFalse)", "5");
+shouldBe("arrayWithHoles.findIndex(passEmptyString)", "7");
+arrayWithHoles[0] = {};
+shouldBe("arrayWithHoles.findIndex(passUndefined)", "2");
</ins><span class="cx">
</span><span class="cx"> debug("Generic Object");
</span><span class="cx"> shouldBe("toObject([undefined, 0, null, false, '']).findIndex(passUndefined)", "0");
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> shouldBe("toObject([undefined, 0, null, '']).findIndex(passFalse)", "-1");
</span><span class="cx"> shouldBe("toObject([undefined, 0, null, false]).findIndex(passEmptyString)", "-1");
</span><span class="cx"> shouldBe("toObject([undefined, null, false, '']).findIndex(passZero)", "-1");
</span><del>-shouldBe("toObject(new Array(20)).findIndex(passUndefined)", "-1");
</del><ins>+shouldBe("toObject(new Array(20)).findIndex(passUndefined)", "0");
</ins><span class="cx">
</span><span class="cx"> debug("Array-like object with invalid lengths");
</span><span class="cx"> var throwError = function throwError() {
</span><span class="lines">@@ -112,5 +112,5 @@
</span><span class="cx"> shouldThrow("[].findIndex(null)", "'TypeError: Array.prototype.findIndex callback must be a function'");
</span><span class="cx"> shouldThrow("[].findIndex(undefined)", "'TypeError: Array.prototype.findIndex callback must be a function'");
</span><span class="cx">
</span><del>-debug("Callbacks in the expected order and skipping holes");
-shouldBe("numberOfCallbacksInFindIndexInArrayWithHoles()", "5");
</del><ins>+debug("Callbacks in the expected order and *not* skipping holes");
+shouldBe("numberOfCallbacksInFindIndexInArrayWithHoles()", "8");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184847 => 184848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-25 02:38:22 UTC (rev 184847)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-25 03:51:17 UTC (rev 184848)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-24 Jordan Harband <ljharb@gmail.com>
+
+ Array#findIndex/find should not skip holes
+ https://bugs.webkit.org/show_bug.cgi?id=145361
+ per https://people.mozilla.org/~jorendorff/es6-draft.html#sec-array.prototype.findindex
+ and https://people.mozilla.org/~jorendorff/es6-draft.html#sec-array.prototype.find
+
+ Reviewed by Yusuke Suzuki.
+
+ * builtins/Array.prototype.js:
+ (find): Deleted.
+ (findIndex): Deleted.
+
</ins><span class="cx"> 2015-05-24 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Uncaught exception when using Inspect tool on SVG elements
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayprototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/Array.prototype.js (184847 => 184848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/Array.prototype.js 2015-05-25 02:38:22 UTC (rev 184847)
+++ trunk/Source/JavaScriptCore/builtins/Array.prototype.js 2015-05-25 03:51:17 UTC (rev 184848)
</span><span class="lines">@@ -208,8 +208,6 @@
</span><span class="cx">
</span><span class="cx"> var thisArg = arguments.length > 1 ? arguments[1] : undefined;
</span><span class="cx"> for (var i = 0; i < length; i++) {
</span><del>- if (!(i in array))
- continue;
</del><span class="cx"> var kValue = array[i];
</span><span class="cx"> if (callback.@call(thisArg, kValue, i, array))
</span><span class="cx"> return kValue;
</span><span class="lines">@@ -233,8 +231,6 @@
</span><span class="cx">
</span><span class="cx"> var thisArg = arguments.length > 1 ? arguments[1] : undefined;
</span><span class="cx"> for (var i = 0; i < length; i++) {
</span><del>- if (!(i in array))
- continue;
</del><span class="cx"> if (callback.@call(thisArg, array[i], i, array))
</span><span class="cx"> return i;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>