<!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>[189296] branches/safari-601.1.46-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/189296">189296</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 15:29:48 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/189012">r189012</a>. rdar://problem/22462794</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreheapMarkedAllocatorcpp">branches/safari-601.1.46-branch/Source/JavaScriptCore/heap/MarkedAllocator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceJavaScriptCoretestsstressheapallocatorallocatesincorrectsizeforactivationjs">branches/safari-601.1.46-branch/Source/JavaScriptCore/tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog (189295 => 189296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-09-03 22:28:55 UTC (rev 189295)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-09-03 22:29:48 UTC (rev 189296)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r189012.
+
+ 2015-08-26 Saam barati <sbarati@apple.com>
+
+ MarkedBlock::allocateBlock will have the wrong allocation size when (sizeof(MarkedBlock) + bytes) is divisible by WTF::pageSize()
+ https://bugs.webkit.org/show_bug.cgi?id=148500
+
+ Reviewed by Mark Lam.
+
+ Consider the following scenario:
+ - On OS X, WTF::pageSize() is 4*1024 bytes.
+ - JSEnvironmentRecord::allocationSizeForScopeSize(6621) == 53000
+ - sizeof(MarkedBlock) == 248
+ - (248 + 53000) is a multiple of 4*1024.
+ - (248 + 53000)/(4*1024) == 13
+
+ We will allocate a chunk of memory of size 53248 bytes that looks like this:
+ 0 248 256 53248 53256
+ [Marked Block | 8 bytes | payload ...... ] 8 bytes |
+ ^ ^
+ Our Environment record starts here. ^
+ ^
+ Our last JSValue in the environment record will go from byte 53248 to 53256. But, we don't own this memory.
+
+ We need to ensure that we round up sizeof(MarkedBlock) to an
+ atomSize boundary. We need to do this because the first atom
+ inside the MarkedBlock will start at the rounded up multiple
+ of atomSize past MarkedBlock. If we end up with an allocation
+ that is perfectly aligned to the page size, then we will be short
+ 8 bytes (in the current implementation where atomSize is 16 bytes,
+ and MarkedBlock is 248 bytes).
+
+ * heap/MarkedAllocator.cpp:
+ (JSC::MarkedAllocator::allocateBlock):
+ * tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js: Added.
+ (use):
+ (makeFunction):
+
</ins><span class="cx"> 2015-08-26 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r188311.
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreheapMarkedAllocatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/heap/MarkedAllocator.cpp (189295 => 189296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/heap/MarkedAllocator.cpp 2015-09-03 22:28:55 UTC (rev 189295)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/heap/MarkedAllocator.cpp 2015-09-03 22:29:48 UTC (rev 189296)
</span><span class="lines">@@ -175,7 +175,8 @@
</span><span class="cx"> MarkedBlock* MarkedAllocator::allocateBlock(size_t bytes)
</span><span class="cx"> {
</span><span class="cx"> size_t minBlockSize = MarkedBlock::blockSize;
</span><del>- size_t minAllocationSize = WTF::roundUpToMultipleOf(WTF::pageSize(), sizeof(MarkedBlock) + bytes);
</del><ins>+ size_t minAllocationSize = WTF::roundUpToMultipleOf<MarkedBlock::atomSize>(sizeof(MarkedBlock)) + WTF::roundUpToMultipleOf<MarkedBlock::atomSize>(bytes);
+ minAllocationSize = WTF::roundUpToMultipleOf(WTF::pageSize(), minAllocationSize);
</ins><span class="cx"> size_t blockSize = std::max(minBlockSize, minAllocationSize);
</span><span class="cx">
</span><span class="cx"> size_t cellSize = m_cellSize ? m_cellSize : WTF::roundUpToMultipleOf<MarkedBlock::atomSize>(bytes);
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoretestsstressheapallocatorallocatesincorrectsizeforactivationjsfromrev189012trunkSourceJavaScriptCoretestsstressheapallocatorallocatesincorrectsizeforactivationjs"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/Source/JavaScriptCore/tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js (from rev 189012, trunk/Source/JavaScriptCore/tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js) (0 => 189296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js (rev 0)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js 2015-09-03 22:29:48 UTC (rev 189296)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+
+// Consider the following scenario:
+// - On OS X, WTF::pageSize() is 4*1024 bytes.
+// - JSEnvironmentRecord::allocationSizeForScopeSize(6621) == 53000
+// - sizeof(MarkedBlock) == 248
+// - (248 + 53000) is a multiple of 4*1024.
+// - (248 + 53000)/(4*1024) == 13
+
+// We will allocate a chunk of memory of size 53248 bytes that looks like this:
+// 0 248 256 53248 53256
+// [Marked Block | 8 bytes | payload ...... ] 8 bytes |
+// ^ ^
+// Our Environment record starts here. ^
+// ^
+// Our last JSValue in the environment record will go from byte 53248 to 53256. But, we don't own this memory.
+
+var numberOfCapturedVariables = 6621;
+function use() { }
+function makeFunction() {
+ var varName;
+ var outerFunction = "";
+ var innerFunction = "";
+
+ for (var i = 0; i < numberOfCapturedVariables; i++) {
+ varName = "_" + i;
+ outerFunction += "var " + varName + ";";
+ innerFunction += "use(" + varName + ");";
+ }
+ outerFunction += "function foo() {" + innerFunction + "}";
+ var functionString = "(function() { " + outerFunction + "})";
+ var result = eval(functionString);
+ return result;
+}
+
+var arr = [];
+for (var i = 0; i < 50; i++) {
+ var f = makeFunction();
+ f();
+ fullGC();
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>