<!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>[207202] branches/safari-602-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/207202">207202</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 01:41:18 -0700 (Wed, 12 Oct 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204612">r204612</a>. rdar://problem/28216278</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchJSTestsChangeLog">branches/safari-602-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreruntimeScopedArgumentsh">branches/safari-602-branch/Source/JavaScriptCore/runtime/ScopedArguments.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchJSTestsstressscopedargumentswritebarriershouldbeonscopeobjectjs">branches/safari-602-branch/JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/JSTests/ChangeLog (207201 => 207202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/JSTests/ChangeLog        2016-10-12 08:41:15 UTC (rev 207201)
+++ branches/safari-602-branch/JSTests/ChangeLog        2016-10-12 08:41:18 UTC (rev 207202)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-12  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r204612. rdar://problem/28216278
+
+    2016-08-18  Mark Lam  &lt;mark.lam@apple.com&gt;
+
+            ScopedArguments is using the wrong owner object for a write barrier.
+            https://bugs.webkit.org/show_bug.cgi?id=160976
+            &lt;rdar://problem/27328506&gt;
+
+            Reviewed by Keith Miller.
+
+            * stress/scoped-arguments-write-barrier-should-be-on-scope-object.js: Added.
+
</ins><span class="cx"> 2016-09-09  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r204403. rdar://problem/27991568
</span></span></pre></div>
<a id="branchessafari602branchJSTestsstressscopedargumentswritebarriershouldbeonscopeobjectjs"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js (0 => 207202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js                                (rev 0)
+++ branches/safari-602-branch/JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js        2016-10-12 08:41:18 UTC (rev 207202)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+//@ runDefault
+// This test should not crash.
+
+var arr = [];
+let numberOfIterations = 1000;
+
+function captureScopedArguments(i) {
+    try {
+        eval(&quot;arr[&quot; + i + &quot;] = arguments&quot;);
+    } catch(e) {
+    }
+}
+
+function addPointersToEdenGenObjects(i) {
+    Array.prototype.push.call(arr[i], [,,]);
+
+    try {
+        Array.prototype.reverse.call(arr[i])
+    } catch (e) {
+    }
+}
+
+for (var i = 0; i &lt; numberOfIterations; i++) {
+    captureScopedArguments(i);
+}
+
+gc(); // Promote those ScopeArguments to the old generation.
+
+for (var i = 0; i &lt; numberOfIterations; i++) {
+    addPointersToEdenGenObjects(i);
+}
+
+edenGC(); // Do eden GC to scan the remembered set which should include the ScopedArguments.
+
+gc(); // Scan the ScopedArguments again. They better not point to collected objects.
</ins></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (207201 => 207202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog        2016-10-12 08:41:15 UTC (rev 207201)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog        2016-10-12 08:41:18 UTC (rev 207202)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-12  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r204612. rdar://problem/28216278
+
+    2016-08-18  Mark Lam  &lt;mark.lam@apple.com&gt;
+
+            ScopedArguments is using the wrong owner object for a write barrier.
+            https://bugs.webkit.org/show_bug.cgi?id=160976
+            &lt;rdar://problem/27328506&gt;
+
+            Reviewed by Keith Miller.
+
+            * runtime/ScopedArguments.h:
+            (JSC::ScopedArguments::setIndexQuickly):
+
</ins><span class="cx"> 2016-09-14  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r205882. rdar://problem/28233331
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreruntimeScopedArgumentsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/runtime/ScopedArguments.h (207201 => 207202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/runtime/ScopedArguments.h        2016-10-12 08:41:15 UTC (rev 207201)
+++ branches/safari-602-branch/Source/JavaScriptCore/runtime/ScopedArguments.h        2016-10-12 08:41:18 UTC (rev 207202)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">         ASSERT_WITH_SECURITY_IMPLICATION(canAccessIndexQuickly(i));
</span><span class="cx">         unsigned namedLength = m_table-&gt;length();
</span><span class="cx">         if (i &lt; namedLength)
</span><del>-            m_scope-&gt;variableAt(m_table-&gt;get(i)).set(vm, this, value);
</del><ins>+            m_scope-&gt;variableAt(m_table-&gt;get(i)).set(vm, m_scope.get(), value);
</ins><span class="cx">         else
</span><span class="cx">             overflowStorage()[i - namedLength].set(vm, this, value);
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>