<!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>[186555] branches/safari-600.1.4.17-branch/Source/JavaScriptCore</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/186555">186555</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 18:03:35 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183128">r183128</a>. rdar://problem/21716620</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchSourceJavaScriptCoreChangeLog">branches/safari-600.1.4.17-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceJavaScriptCoreruntimeJSObjectcpp">branches/safari-600.1.4.17-branch/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchSourceJavaScriptCoretestsstresssparsearrayentryupdate144067js">branches/safari-600.1.4.17-branch/Source/JavaScriptCore/tests/stress/sparse-array-entry-update-144067.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001417branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/JavaScriptCore/ChangeLog (186554 => 186555)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/JavaScriptCore/ChangeLog 2015-07-09 01:03:32 UTC (rev 186554)
+++ branches/safari-600.1.4.17-branch/Source/JavaScriptCore/ChangeLog 2015-07-09 01:03:35 UTC (rev 186555)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-07-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r183128. rdar://problem/21716620
+
+ 2015-04-22 Mark Lam <mark.lam@apple.com>
+
+ SparseArrayEntry's write barrier owner should be the SparseArrayValueMap.
+ https://bugs.webkit.org/show_bug.cgi?id=144067
+
+ Reviewed by Michael Saboff.
+
+ Currently, there are a few places where the JSObject that owns the
+ SparseArrayValueMap is designated as the owner of the SparseArrayEntry
+ write barrier. This is a bug and can result in the GC collecting the
+ SparseArrayEntry even though it is being referenced by the
+ SparseArrayValueMap. This patch fixes the bug.
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::enterDictionaryIndexingModeWhenArrayStorageAlreadyExists):
+ (JSC::JSObject::putIndexedDescriptor):
+ * tests/stress/sparse-array-entry-update-144067.js: Added.
+ (useMemoryToTriggerGCs):
+ (foo):
+
+2015-07-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r182829. rdar://problem/21716511
</span><span class="cx">
</span><span class="cx"> 2015-04-14 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari6001417branchSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/JavaScriptCore/runtime/JSObject.cpp (186554 => 186555)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/JavaScriptCore/runtime/JSObject.cpp 2015-07-09 01:03:32 UTC (rev 186554)
+++ branches/safari-600.1.4.17-branch/Source/JavaScriptCore/runtime/JSObject.cpp 2015-07-09 01:03:35 UTC (rev 186555)
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> // This will always be a new entry in the map, so no need to check we can write,
</span><span class="cx"> // and attributes are default so no need to set them.
</span><span class="cx"> if (value)
</span><del>- map->add(this, i).iterator->value.set(vm, this, value);
</del><ins>+ map->add(this, i).iterator->value.set(vm, map, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DeferGC deferGC(vm.heap);
</span><span class="lines">@@ -1693,12 +1693,13 @@
</span><span class="cx"> void JSObject::putIndexedDescriptor(ExecState* exec, SparseArrayEntry* entryInMap, const PropertyDescriptor& descriptor, PropertyDescriptor& oldDescriptor)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto map = m_butterfly->arrayStorage()->m_sparseMap.get();
</ins><span class="cx">
</span><span class="cx"> if (descriptor.isDataDescriptor()) {
</span><span class="cx"> if (descriptor.value())
</span><del>- entryInMap->set(vm, this, descriptor.value());
</del><ins>+ entryInMap->set(vm, map, descriptor.value());
</ins><span class="cx"> else if (oldDescriptor.isAccessorDescriptor())
</span><del>- entryInMap->set(vm, this, jsUndefined());
</del><ins>+ entryInMap->set(vm, map, jsUndefined());
</ins><span class="cx"> entryInMap->attributes = descriptor.attributesOverridingCurrent(oldDescriptor) & ~Accessor;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1721,7 +1722,7 @@
</span><span class="cx"> if (setter)
</span><span class="cx"> accessor->setSetter(vm, setter);
</span><span class="cx">
</span><del>- entryInMap->set(vm, this, accessor);
</del><ins>+ entryInMap->set(vm, map, accessor);
</ins><span class="cx"> entryInMap->attributes = descriptor.attributesOverridingCurrent(oldDescriptor) & ~ReadOnly;
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001417branchSourceJavaScriptCoretestsstresssparsearrayentryupdate144067js"></a>
<div class="addfile"><h4>Added: branches/safari-600.1.4.17-branch/Source/JavaScriptCore/tests/stress/sparse-array-entry-update-144067.js (0 => 186555)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/JavaScriptCore/tests/stress/sparse-array-entry-update-144067.js (rev 0)
+++ branches/safari-600.1.4.17-branch/Source/JavaScriptCore/tests/stress/sparse-array-entry-update-144067.js 2015-07-09 01:03:35 UTC (rev 186555)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// Regression test for https://bugs.webkit.org/show_bug.cgi?id=144067.
+// This test aims to continually override the setter in a sparse array object, and
+// trigger GCs to give it a chance to collect the newly set entry value if the bug exists.
+// With the bug fixed, this test should not crash.
+
+var data = {};
+var sparseObj = {};
+
+for (var i = 0; i < 5; i++)
+ sparseObj[i] = i;
+
+function useMemoryToTriggerGCs() {
+ var arr = [];
+ var limit = DFGTrue() ? 10000 : 100;
+ for (var i = 0; i < limit; i++)
+ arr[i] = { a: "using" + i, b: "up" + i, c: "memory" + i };
+ return arr;
+}
+
+function foo(x) {
+ if (!x)
+ return;
+ data.textContent = sparseObj.__defineSetter__("16384", foo);
+ for (var i = 0; i < 10; i++)
+ sparseObj.__defineSetter__("" + (16384 + i), foo);
+ useMemoryToTriggerGCs();
+ sparseObj[16384] = x - 1;
+}
+
+var recursionDepthNeededToTriggerTheFailure = 100;
+foo(recursionDepthNeededToTriggerTheFailure);
</ins></span></pre>
</div>
</div>
</body>
</html>