<!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>[206573] 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/206573">206573</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-09-28 18:29:03 -0700 (Wed, 28 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>stringProtoFuncRepeatCharacter will return `null` when it should not
https://bugs.webkit.org/show_bug.cgi?id=161944
Reviewed by Yusuke Suzuki.
JSTests:
* stress/pad-start-calls-repeat-character-with-double.js: Added.
(logLinesWithContext):
Source/JavaScriptCore:
stringProtoFuncRepeatCharacter was expecting its second argument
to always be a boxed integer. This is not correct. The DFG may decide
to represent a particular value as a double instead of integer. This
function needs to have correct behavior when its second argument is
a boxed double. I also added an assertion stating that the second argument
is always a number. We can guarantee this since it's only called from
builtins.
* runtime/StringPrototype.cpp:
(JSC::stringProtoFuncRepeatCharacter):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsStringPrototypejs">trunk/Source/JavaScriptCore/builtins/StringPrototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstresspadstartcallsrepeatcharacterwithdoublejs">trunk/JSTests/stress/pad-start-calls-repeat-character-with-double.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (206572 => 206573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-09-29 01:14:38 UTC (rev 206572)
+++ trunk/JSTests/ChangeLog 2016-09-29 01:29:03 UTC (rev 206573)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-28 Saam Barati <sbarati@apple.com>
+
+ stringProtoFuncRepeatCharacter will return `null` when it should not
+ https://bugs.webkit.org/show_bug.cgi?id=161944
+
+ Reviewed by Yusuke Suzuki.
+
+ * stress/pad-start-calls-repeat-character-with-double.js: Added.
+ (logLinesWithContext):
+
</ins><span class="cx"> 2016-09-27 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3::lowerMacros forgets to before->updatePredecessorsAfter() when lowering ChillMod on ARM64
</span></span></pre></div>
<a id="trunkJSTestsstresspadstartcallsrepeatcharacterwithdoublejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/pad-start-calls-repeat-character-with-double.js (0 => 206573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/pad-start-calls-repeat-character-with-double.js (rev 0)
+++ trunk/JSTests/stress/pad-start-calls-repeat-character-with-double.js 2016-09-29 01:29:03 UTC (rev 206573)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+function logLinesWithContext(n, context) {
+ let start = n - context;
+ let end = n + context;
+ for (let x = start; x <= end; ++x) {
+ let number = x.toString().padStart(3);
+ if (parseInt(number) !== x)
+ throw new Error("Bad result from pad start: " + number);
+ }
+}
+noInline(logLinesWithContext);
+
+let numbers = [
+ 19,19,19,19,19,19,19,20,20,20,20,20,20,20,11,11,11,11,11,11,11,20,20,20,20,
+ 20,20,20,15,15,15,15,15,15,15,21,21,21,21,21,21,21,19,19,19,19,19,19,19,20,
+ 20,20,20,20,20,20,20,20,20,20,20,20,20,21,21,21,21,21,21,21,24,24,24,24,24,
+ 24,24,25,25,25,25,25,25,25,11,11,11,11,11,11,11,25,25,25,25,25,25,25,15,15,
+ 15,15,15,15,15,25,25,25,25,25,25,25,7,7,7,7,7,7,7,26,26,26,26,26,26,26,24,
+ 24,24,24,24,24,24,25,25,25,25,25,25,25,11,11,11,11,11,11,11,25,25,25,25,25,
+ 25,25,26,26,26,26,26,26,26,24,24,24,24,24,24,24,25,25,25,25,25,25,25,11,11,
+ 11,11,11,11,11,12,12,12,12,12,12,12,25,25,25,25,25,25,25,15,15,15,15,15,15,
+ 15,16,16,16,16,16,16,16,25,25,25,25,25,25,25,7,7,7,7,7,7,7,8,8,8,8,8,8,8,
+ 26,26,26,26,26,26,26,24,24,24,24,24,24,24,25,25,25,25,25,25,25,11,11,11,11,
+ 11,11,11,12,12,12,12,12,12,12,25,25,25,25,25,25,25,15,15,15,15,15,15,15,16,
+ 16,16,16,16,16,16,25,25,25,25,25,25,25,7,7,7,7,7,7,7,8,8,8,8,8,8,8,26,26,
+ 26,26,26,26,26,29,29,29,29,29,29,29,30,30,30,30,30,30,30,35,35,35,35,35,35,
+ 35,29,29,29,29,29,29,29,30,30,30,30,30,30,30,11,11,11,11,11,11,11,33,33,33,
+ 33,33,33,33,35,35,35,35,35,35,35,39,39,39,39,39,39,39,40,40,40,40,40,40,40,
+ 11,11,11,11,11,11,11,40,40,40,40,40,40,40,40,40,40,40,40,40,40,15,15,15,15,
+ 15,15,15,41,41,41,41,41,41,41,39,39,39,39,39,39,39,40,40,40,40,40,40,40,40,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+ 45,45,46,46,46,46,46,46,46,11,11,11,11,11,11,11,46,46,46,46,46,46,46,15,15,
+];
+
+for (let n of numbers)
+ logLinesWithContext(n, 3);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206572 => 206573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-29 01:14:38 UTC (rev 206572)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-29 01:29:03 UTC (rev 206573)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-28 Saam Barati <sbarati@apple.com>
+
+ stringProtoFuncRepeatCharacter will return `null` when it should not
+ https://bugs.webkit.org/show_bug.cgi?id=161944
+
+ Reviewed by Yusuke Suzuki.
+
+ stringProtoFuncRepeatCharacter was expecting its second argument
+ to always be a boxed integer. This is not correct. The DFG may decide
+ to represent a particular value as a double instead of integer. This
+ function needs to have correct behavior when its second argument is
+ a boxed double. I also added an assertion stating that the second argument
+ is always a number. We can guarantee this since it's only called from
+ builtins.
+
+ * runtime/StringPrototype.cpp:
+ (JSC::stringProtoFuncRepeatCharacter):
+
</ins><span class="cx"> 2016-09-28 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> The write barrier should be down with TSO
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsStringPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/StringPrototype.js (206572 => 206573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/StringPrototype.js 2016-09-29 01:14:38 UTC (rev 206572)
+++ trunk/Source/JavaScriptCore/builtins/StringPrototype.js 2016-09-29 01:29:03 UTC (rev 206573)
</span><span class="lines">@@ -110,11 +110,8 @@
</span><span class="cx"> if (count < 0 || count === @Infinity)
</span><span class="cx"> throw new @RangeError("String.prototype.repeat argument must be greater than or equal to 0 and not be Infinity");
</span><span class="cx">
</span><del>- if (string.length === 1) {
- var result = @repeatCharacter(string, count);
- if (result !== null)
- return result;
- }
</del><ins>+ if (string.length === 1)
+ return @repeatCharacter(string, count);
</ins><span class="cx">
</span><span class="cx"> return @repeatSlowPath(string, count);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (206572 => 206573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-09-29 01:14:38 UTC (rev 206572)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-09-29 01:29:03 UTC (rev 206573)
</span><span class="lines">@@ -780,11 +780,19 @@
</span><span class="cx"> JSString* string = jsCast<JSString*>(exec->uncheckedArgument(0));
</span><span class="cx"> ASSERT(string->length() == 1);
</span><span class="cx">
</span><del>- if (!exec->uncheckedArgument(1).isInt32())
- return JSValue::encode(jsNull());
-
- int32_t repeatCount = exec->uncheckedArgument(1).asInt32();
</del><ins>+ JSValue repeatCountValue = exec->uncheckedArgument(1);
+ RELEASE_ASSERT(repeatCountValue.isNumber());
+ int32_t repeatCount;
+ {
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ double value = repeatCountValue.asNumber();
+ if (value > JSString::MaxLength)
+ return JSValue::encode(throwOutOfMemoryError(exec, scope));
+ repeatCount = static_cast<int32_t>(value);
+ }
</ins><span class="cx"> ASSERT(repeatCount >= 0);
</span><ins>+ ASSERT(!repeatCountValue.isDouble() || repeatCountValue.asDouble() == repeatCount);
</ins><span class="cx">
</span><span class="cx"> UChar character = string->view(exec)[0];
</span><span class="cx"> if (!(character & ~0xff))
</span></span></pre>
</div>
</div>
</body>
</html>