<!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>[183694] 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/183694">183694</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-01 15:44:30 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>String#startsWith/endsWith/includes don't handle Infinity position/endPosition args correctly
https://bugs.webkit.org/show_bug.cgi?id=144314
Patch by Jordan Harband <ljharb@gmail.com> on 2015-05-01
Reviewed by Darin Adler.
Source/JavaScriptCore:
Fixing handling of Infinity position args, per
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.includes
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.startswith
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
* runtime/StringPrototype.cpp:
(JSC::clampInt32):
(JSC::stringProtoFuncStartsWith):
(JSC::stringProtoFuncEndsWith):
(JSC::stringProtoFuncIncludes):
LayoutTests:
* js/script-tests/string-includes.js:
* js/string-includes-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsstringincludesjs">trunk/LayoutTests/js/script-tests/string-includes.js</a></li>
<li><a href="#trunkLayoutTestsjsstringincludesexpectedtxt">trunk/LayoutTests/js/string-includes-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183693 => 183694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-01 22:38:02 UTC (rev 183693)
+++ trunk/LayoutTests/ChangeLog 2015-05-01 22:44:30 UTC (rev 183694)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-01 Jordan Harband <ljharb@gmail.com>
+
+ String#startsWith/endsWith/includes don't handle Infinity position/endPosition args correctly
+ https://bugs.webkit.org/show_bug.cgi?id=144314
+
+ Reviewed by Darin Adler.
+
+ * js/script-tests/string-includes.js:
+ * js/string-includes-expected.txt:
+
</ins><span class="cx"> 2015-05-01 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed gardening for GTK+.
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsstringincludesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/string-includes.js (183693 => 183694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/string-includes.js 2015-05-01 22:38:02 UTC (rev 183693)
+++ trunk/LayoutTests/js/script-tests/string-includes.js 2015-05-01 22:44:30 UTC (rev 183694)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><del>-description("This test checks the ES6 string functions startsWith(), endsWith() and includes().");
</del><ins>+description("This test checks the ES6 string functions startsWith(), endsWith(), and includes().");
</ins><span class="cx">
</span><span class="cx"> // Test includes
</span><ins>+shouldBe("String.prototype.includes.name", "'includes'");
</ins><span class="cx"> shouldBe("String.prototype.includes.length", "1");
</span><span class="cx"> shouldBe("'foo bar'.includes('bar')", "true");
</span><span class="cx"> shouldBe("'foo bar'.includes('bar', 4)", "true");
</span><span class="lines">@@ -30,8 +31,16 @@
</span><span class="cx"> shouldBe("'foo 1e100 bar'.includes(1e100)", "false");
</span><span class="cx"> shouldBe("'フーバー'.includes('ーバ')", "true");
</span><span class="cx"> shouldBe("'フーバー'.includes('クー')", "false");
</span><ins>+shouldBeFalse("'abc'.includes('a', 'abc'.length)");
+shouldBeFalse("'abc'.includes('a', Math.pow(2, 33))");
+shouldBeFalse("'abc'.includes('a', Infinity)");
+shouldBeTrue("'abc'.includes('ab', -Infinity)");
+shouldBeFalse("'abc'.includes('cd', -Infinity)");
+shouldBeTrue("'abc'.includes('ab', 0)");
+shouldBeFalse("'abc'.includes('cd', 0)");
</ins><span class="cx">
</span><span class="cx"> // Test startsWith
</span><ins>+shouldBe("String.prototype.startsWith.name", "'startsWith'");
</ins><span class="cx"> shouldBe("String.prototype.startsWith.length", "1");
</span><span class="cx"> shouldBe("'foo bar'.startsWith('foo')", "true");
</span><span class="cx"> shouldBe("'foo bar'.startsWith('foo', 0)", "true");
</span><span class="lines">@@ -60,8 +69,15 @@
</span><span class="cx"> shouldBe("'フーバー'.startsWith('abc', 1)", "false");
</span><span class="cx"> shouldBe("'foo bar'.startsWith('フー')", "false");
</span><span class="cx"> shouldBe("'foo bar'.startsWith('フー', 1)", "false");
</span><ins>+shouldBeFalse("'abc'.startsWith('a', Infinity)");
+shouldBeFalse("'abc'.startsWith('a', 1)");
+shouldBeTrue("'abc'.startsWith('b', 1)");
+shouldBeFalse("'abc'.startsWith('b', 2)");
+shouldBeTrue("'abc'.startsWith('c', 2)");
+shouldBeFalse("'abc'.startsWith('a', Math.pow(2, 33))");
</ins><span class="cx">
</span><span class="cx"> // Test endsWith
</span><ins>+shouldBe("String.prototype.endsWith.name", "'endsWith'");
</ins><span class="cx"> shouldBe("String.prototype.endsWith.length", "1");
</span><span class="cx"> shouldBe("'foo bar'.endsWith('bar')", "true");
</span><span class="cx"> shouldBe("'foo bar'.endsWith('ba', 6)", "true");
</span><span class="lines">@@ -93,6 +109,14 @@
</span><span class="cx"> shouldBe("'フーバー'.endsWith('abc')", "false");
</span><span class="cx"> shouldBe("'foo bar'.endsWith('フー')", "false");
</span><span class="cx"> shouldBe("'foo bar'.endsWith('フー', 3)", "false");
</span><ins>+shouldBeTrue("'abc'.endsWith('bc', Infinity)");
+shouldBeTrue("'abc'.endsWith('bc', Math.pow(2, 33))");
+shouldBeFalse("'abc'.endsWith('a', 0)");
+shouldBeTrue("'abc'.endsWith('a', 1)");
+shouldBeFalse("'abc'.endsWith('b', 1)");
+shouldBeTrue("'abc'.endsWith('b', 2)");
+shouldBeFalse("'abc'.endsWith('bc', 2)");
+shouldBeTrue("'abc'.endsWith('bc', 3)");
</ins><span class="cx">
</span><span class="cx"> // Call functions with an environment record as 'this'.
</span><span class="cx"> shouldThrow("(function() { var f = String.prototype.startsWith; (function() { f('a'); })(); })()");
</span></span></pre></div>
<a id="trunkLayoutTestsjsstringincludesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/string-includes-expected.txt (183693 => 183694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/string-includes-expected.txt 2015-05-01 22:38:02 UTC (rev 183693)
+++ trunk/LayoutTests/js/string-includes-expected.txt 2015-05-01 22:44:30 UTC (rev 183694)
</span><span class="lines">@@ -1,8 +1,9 @@
</span><del>-This test checks the ES6 string functions startsWith(), endsWith() and includes().
</del><ins>+This test checks the ES6 string functions startsWith(), endsWith(), and includes().
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS String.prototype.includes.name is 'includes'
</ins><span class="cx"> PASS String.prototype.includes.length is 1
</span><span class="cx"> PASS 'foo bar'.includes('bar') is true
</span><span class="cx"> PASS 'foo bar'.includes('bar', 4) is true
</span><span class="lines">@@ -32,6 +33,14 @@
</span><span class="cx"> PASS 'foo 1e100 bar'.includes(1e100) is false
</span><span class="cx"> PASS 'フーバー'.includes('ーバ') is true
</span><span class="cx"> PASS 'フーバー'.includes('クー') is false
</span><ins>+PASS 'abc'.includes('a', 'abc'.length) is false
+PASS 'abc'.includes('a', Math.pow(2, 33)) is false
+PASS 'abc'.includes('a', Infinity) is false
+PASS 'abc'.includes('ab', -Infinity) is true
+PASS 'abc'.includes('cd', -Infinity) is false
+PASS 'abc'.includes('ab', 0) is true
+PASS 'abc'.includes('cd', 0) is false
+PASS String.prototype.startsWith.name is 'startsWith'
</ins><span class="cx"> PASS String.prototype.startsWith.length is 1
</span><span class="cx"> PASS 'foo bar'.startsWith('foo') is true
</span><span class="cx"> PASS 'foo bar'.startsWith('foo', 0) is true
</span><span class="lines">@@ -60,6 +69,13 @@
</span><span class="cx"> PASS 'フーバー'.startsWith('abc', 1) is false
</span><span class="cx"> PASS 'foo bar'.startsWith('フー') is false
</span><span class="cx"> PASS 'foo bar'.startsWith('フー', 1) is false
</span><ins>+PASS 'abc'.startsWith('a', Infinity) is false
+PASS 'abc'.startsWith('a', 1) is false
+PASS 'abc'.startsWith('b', 1) is true
+PASS 'abc'.startsWith('b', 2) is false
+PASS 'abc'.startsWith('c', 2) is true
+PASS 'abc'.startsWith('a', Math.pow(2, 33)) is false
+PASS String.prototype.endsWith.name is 'endsWith'
</ins><span class="cx"> PASS String.prototype.endsWith.length is 1
</span><span class="cx"> PASS 'foo bar'.endsWith('bar') is true
</span><span class="cx"> PASS 'foo bar'.endsWith('ba', 6) is true
</span><span class="lines">@@ -91,6 +107,14 @@
</span><span class="cx"> PASS 'フーバー'.endsWith('abc') is false
</span><span class="cx"> PASS 'foo bar'.endsWith('フー') is false
</span><span class="cx"> PASS 'foo bar'.endsWith('フー', 3) is false
</span><ins>+PASS 'abc'.endsWith('bc', Infinity) is true
+PASS 'abc'.endsWith('bc', Math.pow(2, 33)) is true
+PASS 'abc'.endsWith('a', 0) is false
+PASS 'abc'.endsWith('a', 1) is true
+PASS 'abc'.endsWith('b', 1) is false
+PASS 'abc'.endsWith('b', 2) is true
+PASS 'abc'.endsWith('bc', 2) is false
+PASS 'abc'.endsWith('bc', 3) is true
</ins><span class="cx"> PASS (function() { var f = String.prototype.startsWith; (function() { f('a'); })(); })() threw exception TypeError: Type error.
</span><span class="cx"> PASS (function() { var f = String.prototype.endsWith; (function() { f('a'); })(); })() threw exception TypeError: Type error.
</span><span class="cx"> PASS (function() { var f = String.prototype.includes; (function() { f('a'); })(); })() threw exception TypeError: Type error.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183693 => 183694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-01 22:38:02 UTC (rev 183693)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-01 22:44:30 UTC (rev 183694)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-01 Jordan Harband <ljharb@gmail.com>
+
+ String#startsWith/endsWith/includes don't handle Infinity position/endPosition args correctly
+ https://bugs.webkit.org/show_bug.cgi?id=144314
+
+ Reviewed by Darin Adler.
+
+ Fixing handling of Infinity position args, per
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.includes
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.startswith
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
+
+ * runtime/StringPrototype.cpp:
+ (JSC::clampInt32):
+ (JSC::stringProtoFuncStartsWith):
+ (JSC::stringProtoFuncEndsWith):
+ (JSC::stringProtoFuncIncludes):
+
</ins><span class="cx"> 2015-05-01 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> Math.abs() returns negative
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (183693 => 183694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2015-05-01 22:38:02 UTC (rev 183693)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2015-05-01 22:44:30 UTC (rev 183694)
</span><span class="lines">@@ -1669,6 +1669,15 @@
</span><span class="cx"> return JSValue::encode(trimString(exec, thisValue, TrimRight));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline unsigned clampAndTruncateToUnsigned(double value, unsigned min, unsigned max)
+{
+ if (value < min)
+ return min;
+ if (value > max)
+ return max;
+ return static_cast<unsigned>(value);
+}
+
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL stringProtoFuncStartsWith(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="lines">@@ -1687,9 +1696,16 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- unsigned start = std::max(0, exec->argument(1).toInt32(exec));
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
</del><ins>+ JSValue positionArg = exec->argument(1);
+ unsigned start = 0;
+ if (positionArg.isInt32())
+ start = std::max(0, positionArg.asInt32());
+ else {
+ unsigned length = stringToSearchIn.length();
+ start = clampAndTruncateToUnsigned(positionArg.toInteger(exec), 0, length);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ }
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsBoolean(stringToSearchIn.hasInfixStartingAt(searchString, start)));
</span><span class="cx"> }
</span><span class="lines">@@ -1713,13 +1729,18 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> unsigned length = stringToSearchIn.length();
</span><del>- JSValue a1 = exec->argument(1);
- int pos = a1.isUndefined() ? length : a1.toInt32(exec);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
- unsigned end = std::min<unsigned>(std::max(pos, 0), length);
</del><span class="cx">
</span><del>- return JSValue::encode(jsBoolean(stringToSearchIn.hasInfixEndingAt(searchString, end)));
</del><ins>+ JSValue endPositionArg = exec->argument(1);
+ unsigned end = length;
+ if (endPositionArg.isInt32())
+ end = std::max(0, endPositionArg.asInt32());
+ else if (!endPositionArg.isUndefined()) {
+ end = clampAndTruncateToUnsigned(endPositionArg.toInteger(exec), 0, length);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ }
+
+ return JSValue::encode(jsBoolean(stringToSearchIn.hasInfixEndingAt(searchString, std::min(end, length))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL stringProtoFuncIncludes(ExecState* exec)
</span><span class="lines">@@ -1740,9 +1761,16 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- unsigned start = std::max(0, exec->argument(1).toInt32(exec));
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
</del><ins>+ JSValue positionArg = exec->argument(1);
+ unsigned start = 0;
+ if (positionArg.isInt32())
+ start = std::max(0, positionArg.asInt32());
+ else {
+ unsigned length = stringToSearchIn.length();
+ start = clampAndTruncateToUnsigned(positionArg.toInteger(exec), 0, length);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ }
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsBoolean(stringToSearchIn.contains(searchString, true, start)));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>