<!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>[198635] branches/safari-601.1.46-branch</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/198635">198635</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-03-24 11:14:28 -0700 (Thu, 24 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198592">r198592</a>. rdar://problem/25271136</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreruntimeArrayPrototypecpp">branches/safari-601.1.46-branch/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreruntimeJSStringJoinerh">branches/safari-601.1.46-branch/Source/JavaScriptCore/runtime/JSStringJoiner.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsjsregress155776expectedtxt">branches/safari-601.1.46-branch/LayoutTests/js/regress-155776-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsjsregress155776html">branches/safari-601.1.46-branch/LayoutTests/js/regress-155776.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsjsscripttestsregress155776js">branches/safari-601.1.46-branch/LayoutTests/js/script-tests/regress-155776.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (198634 => 198635)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-24 18:14:23 UTC (rev 198634)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-24 18:14:28 UTC (rev 198635)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-03-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r198592. rdar://problem/25271136
+
+ 2016-03-23 Michael Saboff <msaboff@apple.com>
+
+ JavaScriptCore ArrayPrototype::join shouldn't cache butterfly when it makes effectful calls
+ https://bugs.webkit.org/show_bug.cgi?id=155776
+
+ Reviewed by Saam Barati.
+
+ New test.
+
+ * js/regress-155776-expected.txt: Added.
+ * js/regress-155776.html: Added.
+ * js/script-tests/regress-155776.js: Added.
+ (fillBigArrayViaToString):
+ (Function.prototype.toString):
+
+2016-03-24 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r195614. rdar://problem/24850429
</span><span class="cx">
</span><span class="cx"> 2016-01-26 Philip Rogers <pdr@chromium.org>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsjsregress155776expectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/js/regress-155776-expected.txt (0 => 198635)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/js/regress-155776-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/js/regress-155776-expected.txt 2016-03-24 18:14:28 UTC (rev 198635)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Regresion test for 155776. This test should pass and not crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS stringResult is expectedString
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsjsregress155776html"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/js/regress-155776.html (0 => 198635)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/js/regress-155776.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/js/regress-155776.html 2016-03-24 18:14:28 UTC (rev 198635)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-155776.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsjsscripttestsregress155776js"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/js/script-tests/regress-155776.js (0 => 198635)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/js/script-tests/regress-155776.js (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/js/script-tests/regress-155776.js 2016-03-24 18:14:28 UTC (rev 198635)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+description("Regresion test for 155776. This test should pass and not crash.");
+
+var bigArray = [];
+var bigNum = 123456789;
+var smallNum = 123;
+var toStringCount = 0;
+
+function fillBigArrayViaToString(n) {
+ var results = [];
+
+ for (var i = 0; i < n; i++)
+ fillBigArrayViaToString.toString();
+
+ return results;
+}
+
+Function.prototype.toString = function(x) {
+ toStringCount++;
+ bigArray.push(smallNum);
+
+ if (toStringCount == 2000) {
+ var newArray = new Uint32Array(8000);
+ for (var i = 0; i < newArray.length; i++)
+ newArray[i] = 0x10000000;
+ }
+
+ bigArray.push(fillBigArrayViaToString);
+ bigArray.push(fillBigArrayViaToString);
+ bigArray.push(fillBigArrayViaToString);
+ return bigNum;
+};
+
+fillBigArrayViaToString(4000).join();
+
+bigArray.length = 4000;
+
+var stringResult = bigArray.join(":");
+
+var expectedArray = [];
+
+for (var i = 0; i < 1000; i++) {
+ expectedArray.push(smallNum);
+ expectedArray.push(bigNum);
+ expectedArray.push(bigNum);
+ expectedArray.push(bigNum);
+}
+
+var expectedString = expectedArray.join(":");
+
+shouldBe('stringResult', 'expectedString');
</ins></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog (198634 => 198635)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2016-03-24 18:14:23 UTC (rev 198634)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2016-03-24 18:14:28 UTC (rev 198635)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-03-24 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r198592. rdar://problem/25271136
+
+ 2016-03-23 Michael Saboff <msaboff@apple.com>
+
+ JavaScriptCore ArrayPrototype::join shouldn't cache butterfly when it makes effectful calls
+ https://bugs.webkit.org/show_bug.cgi?id=155776
+
+ Reviewed by Saam Barati.
+
+ Array.join ends up calling toString, possibly on some object. Since these calls
+ could be effectful and could change the array itself, we can't hold the butterfly
+ pointer while making effectful calls. Changed the code to fall back to the general
+ case when an effectful toString() call might be made.
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::join):
+ * runtime/JSStringJoiner.h:
+ (JSC::JSStringJoiner::appendWithoutSideEffects): New helper that doesn't make effectful
+ toString() calls.
+ (JSC::JSStringJoiner::append): Built upon appendWithoutSideEffects.
+
</ins><span class="cx"> 2016-02-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r196179.
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (198634 => 198635)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-03-24 18:14:23 UTC (rev 198634)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-03-24 18:14:28 UTC (rev 198635)
</span><span class="lines">@@ -404,9 +404,8 @@
</span><span class="cx"> bool holesKnownToBeOK = false;
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> if (JSValue value = data[i].get()) {
</span><del>- joiner.append(state, value);
- if (state.hadException())
- return jsUndefined();
</del><ins>+ if (!joiner.appendWithoutSideEffects(state, value))
+ goto generalCase;
</ins><span class="cx"> } else {
</span><span class="cx"> if (!holesKnownToBeOK) {
</span><span class="cx"> if (holesMustForwardToPrototype(state, thisObject))
</span><span class="lines">@@ -454,9 +453,8 @@
</span><span class="cx"> auto data = storage.vector().data();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> if (JSValue value = data[i].get()) {
</span><del>- joiner.append(state, value);
- if (state.hadException())
- return jsUndefined();
</del><ins>+ if (!joiner.appendWithoutSideEffects(state, value))
+ goto generalCase;
</ins><span class="cx"> } else
</span><span class="cx"> joiner.appendEmptyString();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreruntimeJSStringJoinerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/runtime/JSStringJoiner.h (198634 => 198635)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/runtime/JSStringJoiner.h 2016-03-24 18:14:23 UTC (rev 198634)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/runtime/JSStringJoiner.h 2016-03-24 18:14:28 UTC (rev 198635)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> JSStringJoiner(ExecState&, StringView separator, unsigned stringCount);
</span><span class="cx">
</span><span class="cx"> void append(ExecState&, JSValue);
</span><ins>+ bool appendWithoutSideEffects(ExecState&, JSValue);
</ins><span class="cx"> void appendEmptyString();
</span><span class="cx">
</span><span class="cx"> JSValue join(ExecState&);
</span><span class="lines">@@ -96,7 +97,7 @@
</span><span class="cx"> m_strings.uncheckedAppend({ { }, { } });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE void JSStringJoiner::append(ExecState& state, JSValue value)
</del><ins>+ALWAYS_INLINE bool JSStringJoiner::appendWithoutSideEffects(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> // The following code differs from using the result of JSValue::toString in the following ways:
</span><span class="cx"> // 1) It's inlined more than JSValue::toString is.
</span><span class="lines">@@ -104,36 +105,46 @@
</span><span class="cx"> // 3) It doesn't create a JSString for numbers, true, or false.
</span><span class="cx"> // 4) It turns undefined and null into the empty string instead of "undefined" and "null".
</span><span class="cx"> // 5) It uses optimized code paths for all the cases known to be 8-bit and for the empty string.
</span><ins>+ // If we might make an effectful calls, return false. Otherwise return true.
</ins><span class="cx">
</span><span class="cx"> if (value.isCell()) {
</span><del>- if (value.asCell()->isString()) {
- append(asString(value)->viewWithUnderlyingString(state));
- return;
- }
</del><ins>+ JSString* jsString;
+ if (!value.asCell()->isString())
+ return false;
+ jsString = asString(value);
</ins><span class="cx"> append(value.toString(&state)->viewWithUnderlyingString(state));
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (value.isInt32()) {
</span><span class="cx"> append8Bit(state.vm().numericStrings.add(value.asInt32()));
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx"> if (value.isDouble()) {
</span><span class="cx"> append8Bit(state.vm().numericStrings.add(value.asDouble()));
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx"> if (value.isTrue()) {
</span><span class="cx"> append8Bit(state.vm().propertyNames->trueKeyword.string());
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx"> if (value.isFalse()) {
</span><span class="cx"> append8Bit(state.vm().propertyNames->falseKeyword.string());
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(value.isUndefinedOrNull());
</span><span class="cx"> appendEmptyString();
</span><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ALWAYS_INLINE void JSStringJoiner::append(ExecState& state, JSValue value)
+{
+ if (!appendWithoutSideEffects(state, value)) {
+ JSString* jsString = value.toString(&state);
+ append(jsString->viewWithUnderlyingString(state));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>