<!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>[260906] 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/260906">260906</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2020-04-29 11:03:53 -0700 (Wed, 29 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] JSStringJoiner is missing BigInt handling
https://bugs.webkit.org/show_bug.cgi?id=211174

Reviewed by Mark Lam.

JSTests:

* stress/bigint-to-string-in-array.js: Added.
(shouldBe):

Source/JavaScriptCore:

JSStringJoiner missed handling of BigInt (specifically BigInt32) and appending empty string incorrectly.
In debug build, assertion hits. We should support BigInt in JSStringJoiner.

* runtime/JSStringJoiner.h:
(JSC::JSStringJoiner::appendWithoutSideEffects):</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="#trunkSourceJavaScriptCoreruntimeJSStringJoinerh">trunk/Source/JavaScriptCore/runtime/JSStringJoiner.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressbiginttostringinarrayjs">trunk/JSTests/stress/bigint-to-string-in-array.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (260905 => 260906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2020-04-29 17:52:30 UTC (rev 260905)
+++ trunk/JSTests/ChangeLog     2020-04-29 18:03:53 UTC (rev 260906)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2020-04-29  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] JSStringJoiner is missing BigInt handling
+        https://bugs.webkit.org/show_bug.cgi?id=211174
+
+        Reviewed by Mark Lam.
+
+        * stress/bigint-to-string-in-array.js: Added.
+        (shouldBe):
+
</ins><span class="cx"> 2020-04-28  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] BigInt constructor should accept larger integers than safe-integers
</span></span></pre></div>
<a id="trunkJSTestsstressbiginttostringinarrayjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/bigint-to-string-in-array.js (0 => 260906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/bigint-to-string-in-array.js                                (rev 0)
+++ trunk/JSTests/stress/bigint-to-string-in-array.js   2020-04-29 18:03:53 UTC (rev 260906)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+function shouldBe(actual, expected) {
+    if (actual !== expected)
+        throw new Error('bad value: ' + actual);
+}
+
+shouldBe([10n].toString(), `10`);
+shouldBe([10n, 20n, 30n].toString(), `10,20,30`);
+shouldBe([createHeapBigInt(10n)].toString(), `10`);
+shouldBe([10n, createHeapBigInt(20n), 30n].toString(), `10,20,30`);
+shouldBe([createHeapBigInt(10n), createHeapBigInt(20n), 30n].toString(), `10,20,30`);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (260905 => 260906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2020-04-29 17:52:30 UTC (rev 260905)
+++ trunk/Source/JavaScriptCore/ChangeLog       2020-04-29 18:03:53 UTC (rev 260906)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2020-04-29  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] JSStringJoiner is missing BigInt handling
+        https://bugs.webkit.org/show_bug.cgi?id=211174
+
+        Reviewed by Mark Lam.
+
+        JSStringJoiner missed handling of BigInt (specifically BigInt32) and appending empty string incorrectly.
+        In debug build, assertion hits. We should support BigInt in JSStringJoiner.
+
+        * runtime/JSStringJoiner.h:
+        (JSC::JSStringJoiner::appendWithoutSideEffects):
+
</ins><span class="cx"> 2020-04-29  Saam Barati  <sbarati@apple.com>
</span><span class="cx"> 
</span><span class="cx">         U_STRING_NOT_TERMINATED_WARNING ICU must be handled when using the output buffer as a C string
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringJoinerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSStringJoiner.h (260905 => 260906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSStringJoiner.h     2020-04-29 17:52:30 UTC (rev 260905)
+++ trunk/Source/JavaScriptCore/runtime/JSStringJoiner.h        2020-04-29 18:03:53 UTC (rev 260906)
</span><span class="lines">@@ -116,6 +116,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (value.isCell()) {
</span><span class="cx">         JSString* jsString;
</span><ins>+        // FIXME: Support JSBigInt in side-effect-free append.
+        // https://bugs.webkit.org/show_bug.cgi?id=211173
</ins><span class="cx">         if (!value.asCell()->isString())
</span><span class="cx">             return false;
</span><span class="cx">         jsString = asString(value);
</span><span class="lines">@@ -139,6 +141,14 @@
</span><span class="cx">         append8Bit(globalObject->vm().propertyNames->falseKeyword.string());
</span><span class="cx">         return true;
</span><span class="cx">     }
</span><ins>+
+#if USE(BIGINT32)
+    if (value.isBigInt32()) {
+        appendNumber(globalObject->vm(), value.bigInt32AsInt32());
+        return true;
+    }
+#endif
+
</ins><span class="cx">     ASSERT(value.isUndefinedOrNull());
</span><span class="cx">     appendEmptyString();
</span><span class="cx">     return true;
</span></span></pre>
</div>
</div>

</body>
</html>