<!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>[182506] branches/safari-600.5.17-branch/Source</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/182506">182506</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-04-07 16:27:54 -0700 (Tue, 07 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/181628">r181628</a>. rdar://problem/20394343</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari600517branchSourceJavaScriptCoreChangeLog">branches/safari-600.5.17-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari600517branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">branches/safari-600.5.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#branchessafari600517branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">branches/safari-600.5.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#branchessafari600517branchSourceJavaScriptCorejitExecutableAllocatorFixedVMPoolcpp">branches/safari-600.5.17-branch/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp</a></li>
<li><a href="#branchessafari600517branchSourceWTFChangeLog">branches/safari-600.5.17-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari600517branchSourceWTFwtfMetaAllocatorh">branches/safari-600.5.17-branch/Source/WTF/wtf/MetaAllocator.h</a></li>
<li><a href="#branchessafari600517branchSourceWTFwtfPlatformh">branches/safari-600.5.17-branch/Source/WTF/wtf/Platform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari600517branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5.17-branch/Source/JavaScriptCore/ChangeLog (182505 => 182506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5.17-branch/Source/JavaScriptCore/ChangeLog 2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/JavaScriptCore/ChangeLog 2015-04-07 23:27:54 UTC (rev 182506)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-07 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r181628.
+
+ 2015-03-16 Michael Saboff <msaboff@apple.com>
+
+ Windows X86-64 should use the fixed executable allocator
+ https://bugs.webkit.org/show_bug.cgi?id=142749
+
+ Reviewed by Filip Pizlo.
+
+ Added jit/ExecutableAllocatorFixedVMPool.cpp to Windows build.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * jit/ExecutableAllocatorFixedVMPool.cpp: Don't include unistd.h on Windows.
+
</ins><span class="cx"> 2015-03-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> [FTL] inlined GetMyArgumentByVal with no arguments passed causes instant crash
</span></span></pre></div>
<a id="branchessafari600517branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (182505 => 182506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-04-07 23:27:54 UTC (rev 182506)
</span><span class="lines">@@ -569,6 +569,7 @@
</span><span class="cx"> <ClCompile Include="..\jit\AssemblyHelpers.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\ClosureCallStubRoutine.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\ExecutableAllocator.cpp" />
</span><ins>+ <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp" />
</ins><span class="cx"> <ClCompile Include="..\jit\GCAwareJITStubRoutine.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\HostCallReturnValue.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\JIT.cpp" />
</span></span></pre></div>
<a id="branchessafari600517branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (182505 => 182506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-04-07 23:27:54 UTC (rev 182506)
</span><span class="lines">@@ -1611,6 +1611,9 @@
</span><span class="cx"> <ClCompile Include="JavaScriptCoreDLL.cpp">
</span><span class="cx"> <Filter>API</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp">
+ <Filter>jit</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\API\APICallbackFunction.h">
</span></span></pre></div>
<a id="branchessafari600517branchSourceJavaScriptCorejitExecutableAllocatorFixedVMPoolcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5.17-branch/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp (182505 => 182506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5.17-branch/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp 2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp 2015-04-07 23:27:54 UTC (rev 182506)
</span><span class="lines">@@ -32,7 +32,9 @@
</span><span class="cx">
</span><span class="cx"> #include "CodeProfiling.h"
</span><span class="cx"> #include <errno.h>
</span><ins>+#if !PLATFORM(WIN)
</ins><span class="cx"> #include <unistd.h>
</span><ins>+#endif
</ins><span class="cx"> #include <wtf/MetaAllocator.h>
</span><span class="cx"> #include <wtf/PageReservation.h>
</span><span class="cx"> #include <wtf/VMTags.h>
</span></span></pre></div>
<a id="branchessafari600517branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5.17-branch/Source/WTF/ChangeLog (182505 => 182506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5.17-branch/Source/WTF/ChangeLog 2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/WTF/ChangeLog 2015-04-07 23:27:54 UTC (rev 182506)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-07 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r181628.
+
+ 2015-03-16 Michael Saboff <msaboff@apple.com>
+
+ Windows X86-64 should use the fixed executable allocator
+ https://bugs.webkit.org/show_bug.cgi?id=142749
+
+ Set ENABLE_EXECUTABLE_ALLOCATOR_FIXED for Windows.
+ Needed to export MetaAllocator::currentStatistics() for use in JavaScriptCore.
+
+ * wtf/MetaAllocator.h:
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2015-02-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r179993. <rdar://problem/19813975>
</span></span></pre></div>
<a id="branchessafari600517branchSourceWTFwtfMetaAllocatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5.17-branch/Source/WTF/wtf/MetaAllocator.h (182505 => 182506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5.17-branch/Source/WTF/wtf/MetaAllocator.h 2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/WTF/wtf/MetaAllocator.h 2015-04-07 23:27:54 UTC (rev 182506)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> size_t bytesReserved;
</span><span class="cx"> size_t bytesCommitted;
</span><span class="cx"> };
</span><del>- Statistics currentStatistics();
</del><ins>+ WTF_EXPORT_PRIVATE Statistics currentStatistics();
</ins><span class="cx">
</span><span class="cx"> // Add more free space to the allocator. Call this directly from
</span><span class="cx"> // the constructor if you wish to operate the allocator within a
</span></span></pre></div>
<a id="branchessafari600517branchSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5.17-branch/Source/WTF/wtf/Platform.h (182505 => 182506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5.17-branch/Source/WTF/wtf/Platform.h 2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/WTF/wtf/Platform.h 2015-04-07 23:27:54 UTC (rev 182506)
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
</span><span class="cx"> On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */
</span><span class="cx"> #if ENABLE(ASSEMBLER)
</span><del>-#if CPU(X86_64) && !OS(WINDOWS) || PLATFORM(IOS)
</del><ins>+#if CPU(X86_64) || PLATFORM(IOS)
</ins><span class="cx"> #define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1
</span><span class="cx"> #else
</span><span class="cx"> #define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1
</span></span></pre>
</div>
</div>
</body>
</html>