<!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>[204574] branches/safari-602.1.50.1-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/204574">204574</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-08-17 14:31:33 -0700 (Wed, 17 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204572">r204572</a>. rdar://problem/27889416</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6021501branchSourceJavaScriptCoreChangeLog">branches/safari-602.1.50.1-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6021501branchSourceJavaScriptCoreruntimeArgListcpp">branches/safari-602.1.50.1-branch/Source/JavaScriptCore/runtime/ArgList.cpp</a></li>
<li><a href="#branchessafari6021501branchSourceJavaScriptCoreruntimeArgListh">branches/safari-602.1.50.1-branch/Source/JavaScriptCore/runtime/ArgList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6021501branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.50.1-branch/Source/JavaScriptCore/ChangeLog (204573 => 204574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.50.1-branch/Source/JavaScriptCore/ChangeLog 2016-08-17 21:24:55 UTC (rev 204573)
+++ branches/safari-602.1.50.1-branch/Source/JavaScriptCore/ChangeLog 2016-08-17 21:31:33 UTC (rev 204574)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-08-17 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204572. rdar://problem/27889416
+
+ 2016-08-17 Geoffrey Garen <ggaren@apple.com>
+
+ Fixed a potential bug in MarkedArgumentBuffer.
+ https://bugs.webkit.org/show_bug.cgi?id=160948
+ <rdar://problem/27889416>
+
+ Reviewed by Oliver Hunt.
+
+ I haven't been able to produce an observable test case after some trying.
+
+ * runtime/ArgList.cpp:
+ (JSC::MarkedArgumentBuffer::addMarkSet): New helper function -- I broke
+ this out from existing code for clarity, but the behavior is the same.
+
+ (JSC::MarkedArgumentBuffer::expandCapacity): Ditto.
+
+ (JSC::MarkedArgumentBuffer::slowAppend): Always addMarkSet() on the slow
+ path. This is faster than the old linear scan, and I think it might
+ avoid cases the old scan could miss.
+
+ * runtime/ArgList.h:
+ (JSC::MarkedArgumentBuffer::append): Account for the case where someone
+ has called clear() or removeLast().
+
+ (JSC::MarkedArgumentBuffer::mallocBase): No behavior change -- but it's
+ clearer to test the buffers directly instead of inferring what they
+ might be based on capacity.
+
</ins><span class="cx"> 2016-08-15 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r203972.
</span></span></pre></div>
<a id="branchessafari6021501branchSourceJavaScriptCoreruntimeArgListcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.50.1-branch/Source/JavaScriptCore/runtime/ArgList.cpp (204573 => 204574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.50.1-branch/Source/JavaScriptCore/runtime/ArgList.cpp 2016-08-17 21:24:55 UTC (rev 204573)
+++ branches/safari-602.1.50.1-branch/Source/JavaScriptCore/runtime/ArgList.cpp 2016-08-17 21:31:33 UTC (rev 204574)
</span><span class="lines">@@ -30,6 +30,19 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+void MarkedArgumentBuffer::addMarkSet(JSValue v)
+{
+ if (m_markSet)
+ return;
+
+ Heap* heap = Heap::heap(v);
+ if (!heap)
+ return;
+
+ m_markSet = &heap->markListSet();
+ m_markSet->add(this);
+}
+
</ins><span class="cx"> void ArgList::getSlice(int startIndex, ArgList& result) const
</span><span class="cx"> {
</span><span class="cx"> if (startIndex <= 0 || startIndex >= m_argCount) {
</span><span class="lines">@@ -51,13 +64,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MarkedArgumentBuffer::slowAppend(JSValue v)
</del><ins>+void MarkedArgumentBuffer::expandCapacity()
</ins><span class="cx"> {
</span><span class="cx"> int newCapacity = (Checked<int>(m_capacity) * 2).unsafeGet();
</span><span class="cx"> size_t size = (Checked<size_t>(newCapacity) * sizeof(EncodedJSValue)).unsafeGet();
</span><span class="cx"> EncodedJSValue* newBuffer = static_cast<EncodedJSValue*>(fastMalloc(size));
</span><del>- for (int i = 0; i < m_capacity; ++i)
</del><ins>+ for (int i = 0; i < m_capacity; ++i) {
</ins><span class="cx"> newBuffer[i] = m_buffer[i];
</span><ins>+ addMarkSet(JSValue::decode(m_buffer[i]));
+ }
</ins><span class="cx">
</span><span class="cx"> if (EncodedJSValue* base = mallocBase())
</span><span class="cx"> fastFree(base);
</span><span class="lines">@@ -64,27 +79,16 @@
</span><span class="cx">
</span><span class="cx"> m_buffer = newBuffer;
</span><span class="cx"> m_capacity = newCapacity;
</span><ins>+}
</ins><span class="cx">
</span><ins>+void MarkedArgumentBuffer::slowAppend(JSValue v)
+{
+ if (m_size >= m_capacity)
+ expandCapacity();
+
</ins><span class="cx"> slotFor(m_size) = JSValue::encode(v);
</span><span class="cx"> ++m_size;
</span><del>-
- if (m_markSet)
- return;
-
- // As long as our size stays within our Vector's inline
- // capacity, all our values are allocated on the stack, and
- // therefore don't need explicit marking. Once our size exceeds
- // our Vector's inline capacity, though, our values move to the
- // heap, where they do need explicit marking.
- for (int i = 0; i < m_size; ++i) {
- Heap* heap = Heap::heap(JSValue::decode(slotFor(i)));
- if (!heap)
- continue;
-
- m_markSet = &heap->markListSet();
- m_markSet->add(this);
- break;
- }
</del><ins>+ addMarkSet(v);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="branchessafari6021501branchSourceJavaScriptCoreruntimeArgListh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.50.1-branch/Source/JavaScriptCore/runtime/ArgList.h (204573 => 204574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.50.1-branch/Source/JavaScriptCore/runtime/ArgList.h 2016-08-17 21:24:55 UTC (rev 204573)
+++ branches/safari-602.1.50.1-branch/Source/JavaScriptCore/runtime/ArgList.h 2016-08-17 21:31:33 UTC (rev 204574)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> void append(JSValue v)
</span><span class="cx"> {
</span><del>- if (m_size >= m_capacity)
</del><ins>+ if (m_size >= m_capacity || mallocBase())
</ins><span class="cx"> return slowAppend(v);
</span><span class="cx">
</span><span class="cx"> slotFor(m_size) = JSValue::encode(v);
</span><span class="lines">@@ -100,6 +100,10 @@
</span><span class="cx"> static void markLists(HeapRootVisitor&, ListSet&);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void expandCapacity();
+
+ void addMarkSet(JSValue);
+
</ins><span class="cx"> JS_EXPORT_PRIVATE void slowAppend(JSValue);
</span><span class="cx">
</span><span class="cx"> EncodedJSValue& slotFor(int item) const
</span><span class="lines">@@ -109,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue* mallocBase()
</span><span class="cx"> {
</span><del>- if (m_capacity == static_cast<int>(inlineCapacity))
</del><ins>+ if (m_buffer == m_inlineBuffer)
</ins><span class="cx"> return 0;
</span><span class="cx"> return &slotFor(0);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>