<!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>[242460] releases/WebKitGTK/webkit-2.24</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/242460">242460</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-05 04:42:09 -0800 (Tue, 05 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/242081">r242081</a> - [JSC] Repeat string created from Array.prototype.join() take too much memory
https://bugs.webkit.org/show_bug.cgi?id=193912

Reviewed by Saam Barati.

JSTests:

Added a test and a microbenchmark for corner cases of
Array.prototype.join() with an uninitialized array.

* microbenchmarks/array-prototype-join-uninitialized.js: Added.
* stress/array-prototype-join-uninitialized.js: Added.
(testArray):
(testABC):
(B):
(C):

Source/JavaScriptCore:

Added a fast case in Array.prototype.join when the array is
uninitialized.

* runtime/ArrayPrototype.cpp:
(JSC::canUseFastJoin):
(JSC::fastJoin):
* runtime/JSStringInlines.h:
(JSC::repeatCharacter): moved from StringPrototype.cpp
* runtime/StringPrototype.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224JSTestsChangeLog">releases/WebKitGTK/webkit-2.24/JSTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeArrayPrototypecpp">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeJSStringInlinesh">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/JSStringInlines.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeStringPrototypecpp">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224JSTestsmicrobenchmarksarrayprototypejoinuninitializedjs">releases/WebKitGTK/webkit-2.24/JSTests/microbenchmarks/array-prototype-join-uninitialized.js</a></li>
<li><a href="#releasesWebKitGTKwebkit224JSTestsstressarrayprototypejoinuninitializedjs">releases/WebKitGTK/webkit-2.24/JSTests/stress/array-prototype-join-uninitialized.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224JSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/JSTests/ChangeLog (242459 => 242460)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/JSTests/ChangeLog 2019-03-05 12:42:04 UTC (rev 242459)
+++ releases/WebKitGTK/webkit-2.24/JSTests/ChangeLog    2019-03-05 12:42:09 UTC (rev 242460)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2019-02-26  Guillaume Emont  <guijemont@igalia.com>
+
+        [JSC] Repeat string created from Array.prototype.join() take too much memory
+        https://bugs.webkit.org/show_bug.cgi?id=193912
+
+        Reviewed by Saam Barati.
+
+        Added a test and a microbenchmark for corner cases of
+        Array.prototype.join() with an uninitialized array.
+
+        * microbenchmarks/array-prototype-join-uninitialized.js: Added.
+        * stress/array-prototype-join-uninitialized.js: Added.
+        (testArray):
+        (testABC):
+        (B):
+        (C):
+
</ins><span class="cx"> 2019-02-22  Robin Morisset  <rmorisset@apple.com>
</span><span class="cx"> 
</span><span class="cx">         DFGBytecodeParser should not declare that a node won't clobberExit if DFGFixupPhase can later declare it does clobberExit
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224JSTestsmicrobenchmarksarrayprototypejoinuninitializedjs"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.24/JSTests/microbenchmarks/array-prototype-join-uninitialized.js (0 => 242460)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/JSTests/microbenchmarks/array-prototype-join-uninitialized.js                             (rev 0)
+++ releases/WebKitGTK/webkit-2.24/JSTests/microbenchmarks/array-prototype-join-uninitialized.js        2019-03-05 12:42:09 UTC (rev 242460)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+//@ runDefault
+var N = 10 * 1024 * 1024
+var s = Array(N).join();
+if (s !== ",".repeat(N - 1))
+    throw("Unexpected result of Array.prototype.join()");
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224JSTestsstressarrayprototypejoinuninitializedjs"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.24/JSTests/stress/array-prototype-join-uninitialized.js (0 => 242460)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/JSTests/stress/array-prototype-join-uninitialized.js                              (rev 0)
+++ releases/WebKitGTK/webkit-2.24/JSTests/stress/array-prototype-join-uninitialized.js 2019-03-05 12:42:09 UTC (rev 242460)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+function testArray(array, expected) {
+    var s = array.join('M');
+    if (s !== expected)
+        throw("Bad result for array " + array + " expected: \"" + expected + "\" but got: \"" + s + "\"");
+}
+
+function testABC(n, resA, resB, resC) {
+    testArray(new Array(n), resA);
+    testArray(new B(n), resB);
+    testArray(new C(n), resC);
+}
+
+class B extends Array { }
+class C extends B { }
+
+
+testABC(0, "", "", "");
+testABC(1, "", "", "");
+testABC(3, "MM", "MM", "MM")
+
+B.prototype[0] = "foo";
+testABC(0, "", "", "");
+testABC(1, "", "foo", "foo");
+testABC(3, "MM", "fooMM", "fooMM");
+
+C.prototype[1] = "bar";
+testABC(0, "", "", "");
+testABC(1, "", "foo", "foo");
+testABC(3, "MM", "fooMM", "fooMbarM");
+
+Array.prototype[1] = "baz";
+testABC(0, "", "", "");
+testABC(1, "", "foo", "foo");
+testABC(3, "MbazM", "fooMbazM", "fooMbarM");
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/ChangeLog (242459 => 242460)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/ChangeLog   2019-03-05 12:42:04 UTC (rev 242459)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/ChangeLog      2019-03-05 12:42:09 UTC (rev 242460)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2019-02-26  Guillaume Emont  <guijemont@igalia.com>
+
+        [JSC] Repeat string created from Array.prototype.join() take too much memory
+        https://bugs.webkit.org/show_bug.cgi?id=193912
+
+        Reviewed by Saam Barati.
+
+        Added a fast case in Array.prototype.join when the array is
+        uninitialized.
+
+        * runtime/ArrayPrototype.cpp:
+        (JSC::canUseFastJoin):
+        (JSC::fastJoin):
+        * runtime/JSStringInlines.h:
+        (JSC::repeatCharacter): moved from StringPrototype.cpp
+        * runtime/StringPrototype.cpp:
+
</ins><span class="cx"> 2019-02-25  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Revert r226885 to make SlotVisitor creation lazy
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (242459 => 242460)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/ArrayPrototype.cpp  2019-03-05 12:42:04 UTC (rev 242459)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/ArrayPrototype.cpp     2019-03-05 12:42:09 UTC (rev 242460)
</span><span class="lines">@@ -390,6 +390,7 @@
</span><span class="cx">     case ALL_CONTIGUOUS_INDEXING_TYPES:
</span><span class="cx">     case ALL_INT32_INDEXING_TYPES:
</span><span class="cx">     case ALL_DOUBLE_INDEXING_TYPES:
</span><ins>+    case ALL_UNDECIDED_INDEXING_TYPES:
</ins><span class="cx">         return true;
</span><span class="cx">     default:
</span><span class="cx">         break;
</span><span class="lines">@@ -503,7 +504,22 @@
</span><span class="cx">         }
</span><span class="cx">         RELEASE_AND_RETURN(scope, joiner.join(state));
</span><span class="cx">     }
</span><ins>+    case ALL_UNDECIDED_INDEXING_TYPES: {
+        if (length && holesMustForwardToPrototype(vm, thisObject))
+            goto generalCase;
+        switch (separator.length()) {
+        case 0:
+            RELEASE_AND_RETURN(scope, jsEmptyString(&state));
+        case 1: {
+            if (length <= 1)
+                RELEASE_AND_RETURN(scope, jsEmptyString(&state));
+            if (separator.is8Bit())
+                RELEASE_AND_RETURN(scope, repeatCharacter(state, separator.characters8()[0], length - 1));
+            RELEASE_AND_RETURN(scope, repeatCharacter(state, separator.characters16()[0], length - 1));
+        }
+        }
</ins><span class="cx">     }
</span><ins>+    }
</ins><span class="cx"> 
</span><span class="cx"> generalCase:
</span><span class="cx">     JSStringJoiner joiner(state, separator, length);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeJSStringInlinesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/JSStringInlines.h (242459 => 242460)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/JSStringInlines.h   2019-03-05 12:42:04 UTC (rev 242459)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/JSStringInlines.h      2019-03-05 12:42:09 UTC (rev 242460)
</span><span class="lines">@@ -54,4 +54,22 @@
</span><span class="cx">     return jsNontrivialString(exec, WTFMove(result));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+template <typename CharacterType>
+inline JSString* repeatCharacter(ExecState& exec, CharacterType character, unsigned repeatCount)
+{
+    VM& vm = exec.vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    CharacterType* buffer = nullptr;
+    auto impl = StringImpl::tryCreateUninitialized(repeatCount, buffer);
+    if (!impl) {
+        throwOutOfMemoryError(&exec, scope);
+        return nullptr;
+    }
+
+    std::fill_n(buffer, repeatCount, character);
+
+    RELEASE_AND_RETURN(scope, jsString(&exec, WTFMove(impl)));
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/StringPrototype.cpp (242459 => 242460)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/StringPrototype.cpp 2019-03-05 12:42:04 UTC (rev 242459)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/StringPrototype.cpp    2019-03-05 12:42:09 UTC (rev 242460)
</span><span class="lines">@@ -837,24 +837,6 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template <typename CharacterType>
-static inline JSString* repeatCharacter(ExecState& exec, CharacterType character, unsigned repeatCount)
-{
-    VM& vm = exec.vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
-
-    CharacterType* buffer = nullptr;
-    auto impl = StringImpl::tryCreateUninitialized(repeatCount, buffer);
-    if (!impl) {
-        throwOutOfMemoryError(&exec, scope);
-        return nullptr;
-    }
-
-    std::fill_n(buffer, repeatCount, character);
-
-    RELEASE_AND_RETURN(scope, jsString(&exec, WTFMove(impl)));
-}
-
</del><span class="cx"> EncodedJSValue JSC_HOST_CALL stringProtoFuncRepeatCharacter(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx">     VM& vm = exec->vm();
</span></span></pre>
</div>
</div>

</body>
</html>