Changeset 181750 in webkit

Timestamp:

Mar 19, 2015, 10:52:02 AM (11 years ago)

Author:

msaboff@apple.com

Message:

Merged r181628. <rdar://problem/19804738>

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.

Source/JavaScriptCore:

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.

Source/WTF:

Set ENABLE_EXECUTABLE_ALLOCATOR_FIXED for Windows.
Needed to export MetaAllocator::currentStatistics() for use in JavaScriptCore.

• wtf/MetaAllocator.h:
• wtf/Platform.h:

Location:

branches/safari-600.1.17-branch/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (modified) (1 diff)
• JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/MetaAllocator.h (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)

branches/safari-600.1.17-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-19  Michael Saboff  <msaboff@apple.com>
+
+        Merge r181628. <rdar://problem/19804738>
+
+    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.
+
 2015-02-11  Brent Fulgham  <bfulgham@apple.com>
 

branches/safari-600.1.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

@@ -570 +570 @@
     <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" />

branches/safari-600.1.17-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

@@ -1612 +1612 @@
       <Filter>API</Filter>
     </ClCompile>
+    <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp">
+      <Filter>jit</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>

branches/safari-600.1.17-branch/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp

@@ -33 +33 @@
 #include "CodeProfiling.h"
 #include <errno.h>
+#if !PLATFORM(WIN)
 #include <unistd.h>
+#endif
 #include <wtf/MetaAllocator.h>
 #include <wtf/PageReservation.h>

branches/safari-600.1.17-branch/Source/WTF/ChangeLog

@@ +1 @@
+2015-03-19  Michael Saboff  <msaboff@apple.com>
+
+        Merge r181628. <rdar://problem/19804738>
+
+    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:
+
 2015-02-11  Brent Fulgham  <bfulgham@apple.com>
 

branches/safari-600.1.17-branch/Source/WTF/wtf/MetaAllocator.h

@@ -87 +87 @@
         size_t bytesCommitted;
     };
-    Statistics currentStatistics();
+    WTF_EXPORT_PRIVATE Statistics currentStatistics();
 
     // Add more free space to the allocator. Call this directly from

branches/safari-600.1.17-branch/Source/WTF/wtf/Platform.h

@@ -829 +829 @@
    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