[webkit-changes] [182506] branches/safari-600.5.17-branch/Source

Tue, 07 Apr 2015 16:28:51 -0700

Title: [182506] branches/safari-600.5.17-branch/Source

Diff

Modified: branches/safari-600.5.17-branch/Source/_javascript_Core/ChangeLog (182505 => 182506)


--- branches/safari-600.5.17-branch/Source/_javascript_Core/ChangeLog	2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/_javascript_Core/ChangeLog	2015-04-07 23:27:54 UTC (rev 182506)
@@ -1,3 +1,20 @@
+2015-04-07  Babak Shafiei  <[email protected]>
+
+        Merge r181628.
+
+    2015-03-16  Michael Saboff  <[email protected]>
+
+            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.
+
+            * _javascript_Core.vcxproj/_javascript_Core.vcxproj:
+            * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters:
+            * jit/ExecutableAllocatorFixedVMPool.cpp: Don't include unistd.h on Windows.
+
 2015-03-04  Filip Pizlo  <[email protected]>
 
         [FTL] inlined GetMyArgumentByVal with no arguments passed causes instant crash

Modified: branches/safari-600.5.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj (182505 => 182506)


--- branches/safari-600.5.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj	2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj	2015-04-07 23:27:54 UTC (rev 182506)
@@ -569,6 +569,7 @@
     <ClCompile Include="..\jit\AssemblyHelpers.cpp" />
     <ClCompile Include="..\jit\ClosureCallStubRoutine.cpp" />
     <ClCompile Include="..\jit\ExecutableAllocator.cpp" />
+    <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp" />
     <ClCompile Include="..\jit\GCAwareJITStubRoutine.cpp" />
     <ClCompile Include="..\jit\HostCallReturnValue.cpp" />
     <ClCompile Include="..\jit\JIT.cpp" />

Modified: branches/safari-600.5.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (182505 => 182506)


--- branches/safari-600.5.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters	2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters	2015-04-07 23:27:54 UTC (rev 182506)
@@ -1611,6 +1611,9 @@
     <ClCompile Include="_javascript_CoreDLL.cpp">
       <Filter>API</Filter>
     </ClCompile>
+    <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp">
+      <Filter>jit</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\API\APICallbackFunction.h">

Modified: branches/safari-600.5.17-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp (182505 => 182506)


--- branches/safari-600.5.17-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp	2015-04-07 23:21:06 UTC (rev 182505)
+++ branches/safari-600.5.17-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp	2015-04-07 23:27:54 UTC (rev 182506)
@@ -32,7 +32,9 @@
 
 #include "CodeProfiling.h"
 #include <errno.h>
+#if !PLATFORM(WIN)
 #include <unistd.h>
+#endif
 #include <wtf/MetaAllocator.h>
 #include <wtf/PageReservation.h>
 #include <wtf/VMTags.h>

Modified: branches/safari-600.5.17-branch/Source/WTF/ChangeLog (182505 => 182506)


--- 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)
@@ -1,3 +1,18 @@
+2015-04-07  Babak Shafiei  <[email protected]>
+
+        Merge r181628.
+
+    2015-03-16  Michael Saboff  <[email protected]>
+
+            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 _javascript_Core.
+
+            * wtf/MetaAllocator.h:
+            * wtf/Platform.h:
+
 2015-02-11  Brent Fulgham  <[email protected]>
 
         Merge r179993. <rdar://problem/19813975>

Modified: branches/safari-600.5.17-branch/Source/WTF/wtf/MetaAllocator.h (182505 => 182506)


--- 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)
@@ -86,7 +86,7 @@
         size_t bytesReserved;
         size_t bytesCommitted;
     };
-    Statistics currentStatistics();
+    WTF_EXPORT_PRIVATE Statistics currentStatistics();
 
     // Add more free space to the allocator. Call this directly from
     // the constructor if you wish to operate the allocator within a

Modified: branches/safari-600.5.17-branch/Source/WTF/wtf/Platform.h (182505 => 182506)


--- 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)
@@ -828,7 +828,7 @@
 /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
    On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */
 #if ENABLE(ASSEMBLER)
-#if CPU(X86_64) && !OS(WINDOWS) || PLATFORM(IOS)
+#if CPU(X86_64) || PLATFORM(IOS)
 #define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1
 #else
 #define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to