<!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>[214345] 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/214345">214345</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-03-24 07:30:13 -0700 (Fri, 24 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Use jsNontrivialString agressively for ToString(Int52)
https://bugs.webkit.org/show_bug.cgi?id=170002
Reviewed by Sam Weinig.
JSTests:
* stress/to-string-int52.js: Added.
(shouldBe):
(toString10):
(expected):
Source/JavaScriptCore:
We use the same logic used for Int32 to use jsNontvirialString.
After single character check, produced string is always longer than 1.
Thus, we can use jsNontrivialString.
* runtime/NumberPrototype.cpp:
(JSC::int52ToString):</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="#trunkSourceJavaScriptCoreruntimeNumberPrototypecpp">trunk/Source/JavaScriptCore/runtime/NumberPrototype.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstresstostringint52js">trunk/JSTests/stress/to-string-int52.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (214344 => 214345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2017-03-24 13:59:02 UTC (rev 214344)
+++ trunk/JSTests/ChangeLog 2017-03-24 14:30:13 UTC (rev 214345)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2017-03-23 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ [JSC] Use jsNontrivialString agressively for ToString(Int52)
+ https://bugs.webkit.org/show_bug.cgi?id=170002
+
+ Reviewed by Sam Weinig.
+
+ * stress/to-string-int52.js: Added.
+ (shouldBe):
+ (toString10):
+ (expected):
+
+2017-03-23 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> [JSC][DFG] Make addShouldSpeculateAnyInt more conservative to avoid regression caused by Double <-> Int52 conversions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169998
</span><span class="cx">
</span></span></pre></div>
<a id="trunkJSTestsstresstostringint52js"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/to-string-int52.js (0 => 214345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/to-string-int52.js (rev 0)
+++ trunk/JSTests/stress/to-string-int52.js 2017-03-24 14:30:13 UTC (rev 214345)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+function shouldBe(actual, expected)
+{
+ if (actual !== expected)
+ throw new Error(`bad value: expected:(${expected}),actual:(${actual})`);
+}
+
+function toString(value, radix)
+{
+ return fiatInt52(value).toString(radix);
+}
+noInline(toString);
+
+function toString10(value)
+{
+ return `${fiatInt52(value)}`;
+}
+noInline(toString10);
+
+function expected(num, radix)
+{
+ let characters = "0123456789abcdefghijklmnopqrstuvwxyz";
+ let result = "";
+ let negative = false;
+ if (num < 0) {
+ negative = true;
+ num = -num;
+ }
+
+ do {
+ const index = num % radix;
+ result = characters[index] + result;
+ num = (num - index) / radix;
+ } while (num);
+
+ if (negative)
+ return '-' + result;
+ return result;
+}
+
+for (var i = 0; i < 1e4; ++i) {
+ toString(i, 10);
+ toString(i, 36);
+ toString10(i);
+}
+
+for (var radix = 2; radix < 37; ++radix) {
+ for (var lessThanRadix = -2000; lessThanRadix < radix; ++lessThanRadix)
+ shouldBe(toString(lessThanRadix, radix), expected(lessThanRadix, radix));
+ for (var greaterThanRadix = radix; greaterThanRadix < 2000; ++greaterThanRadix)
+ shouldBe(toString(greaterThanRadix, radix), expected(greaterThanRadix, radix));
+}
+
+{
+ var radix = 10;
+ for (var lessThanRadix = -2000; lessThanRadix < radix; ++lessThanRadix)
+ shouldBe(toString10(lessThanRadix), expected(lessThanRadix, radix));
+ for (var greaterThanRadix = radix; greaterThanRadix < 2000; ++greaterThanRadix)
+ shouldBe(toString10(greaterThanRadix), expected(greaterThanRadix, radix));
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214344 => 214345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-24 13:59:02 UTC (rev 214344)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-24 14:30:13 UTC (rev 214345)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-03-23 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ [JSC] Use jsNontrivialString agressively for ToString(Int52)
+ https://bugs.webkit.org/show_bug.cgi?id=170002
+
+ Reviewed by Sam Weinig.
+
+ We use the same logic used for Int32 to use jsNontvirialString.
+ After single character check, produced string is always longer than 1.
+ Thus, we can use jsNontrivialString.
+
+ * runtime/NumberPrototype.cpp:
+ (JSC::int52ToString):
+
+2017-03-23 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> [JSC] Use WeakRandom for SamplingProfiler interval fluctuation
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170045
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNumberPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NumberPrototype.cpp (214344 => 214345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NumberPrototype.cpp 2017-03-24 13:59:02 UTC (rev 214344)
+++ trunk/Source/JavaScriptCore/runtime/NumberPrototype.cpp 2017-03-24 14:30:13 UTC (rev 214345)
</span><span class="lines">@@ -542,8 +542,15 @@
</span><span class="cx"> JSString* int52ToString(VM& vm, int64_t value, int32_t radix)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!(radix < 2 || radix > 36));
</span><ins>+ // A negative value casted to unsigned would be bigger than 36 (the max radix).
+ if (static_cast<uint64_t>(value) < static_cast<uint64_t>(radix)) {
+ ASSERT(value <= 36);
+ ASSERT(value >= 0);
+ return vm.smallStrings.singleCharacterString(radixDigits[value]);
+ }
+
</ins><span class="cx"> if (radix == 10)
</span><del>- return jsString(&vm, vm.numericStrings.add(static_cast<double>(value)));
</del><ins>+ return jsNontrivialString(&vm, vm.numericStrings.add(static_cast<double>(value)));
</ins><span class="cx">
</span><span class="cx"> // Position the decimal point at the center of the string, set
</span><span class="cx"> // the startOfResultString pointer to point at the decimal point.
</span><span class="lines">@@ -552,7 +559,7 @@
</span><span class="cx"> char* startOfResultString = decimalPoint;
</span><span class="cx"> *decimalPoint = '\0';
</span><span class="cx">
</span><del>- return jsString(&vm, int52ToStringWithRadix(startOfResultString, value, radix));
</del><ins>+ return jsNontrivialString(&vm, int52ToStringWithRadix(startOfResultString, value, radix));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSString* numberToString(VM& vm, double doubleValue, int32_t radix)
</span></span></pre>
</div>
</div>
</body>
</html>