Title: [111431] trunk/Source/_javascript_Core
Revision
111431
Author
[email protected]
Date
2012-03-20 13:02:05 -0700 (Tue, 20 Mar 2012)

Log Message

Allow LLINT to work even when executable allocation fails.
https://bugs.webkit.org/show_bug.cgi?id=81693

Reviewed by Gavin Barraclough.

Don't crash if executable allocation fails if we can fall back on LLINT

* jit/ExecutableAllocatorFixedVMPool.cpp:
(JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
* wtf/OSAllocatorPosix.cpp:
(WTF::OSAllocator::reserveAndCommit):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (111430 => 111431)


--- trunk/Source/_javascript_Core/ChangeLog	2012-03-20 19:58:19 UTC (rev 111430)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-03-20 20:02:05 UTC (rev 111431)
@@ -1,3 +1,17 @@
+2012-03-20  Oliver Hunt  <[email protected]>
+
+        Allow LLINT to work even when executable allocation fails.
+        https://bugs.webkit.org/show_bug.cgi?id=81693
+
+        Reviewed by Gavin Barraclough.
+
+        Don't crash if executable allocation fails if we can fall back on LLINT
+
+        * jit/ExecutableAllocatorFixedVMPool.cpp:
+        (JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
+        * wtf/OSAllocatorPosix.cpp:
+        (WTF::OSAllocator::reserveAndCommit):
+
 2012-03-20  Csaba Osztrogonác  <[email protected]>
 
         Division optimizations fail to infer cases of truncated division and mishandle -2147483648/-1

Modified: trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp (111430 => 111431)


--- trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp	2012-03-20 19:58:19 UTC (rev 111430)
+++ trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp	2012-03-20 20:02:05 UTC (rev 111431)
@@ -59,7 +59,7 @@
         : MetaAllocator(32) // round up all allocations to 32 bytes
     {
         m_reservation = PageReservation::reserveWithGuardPages(fixedPoolSize, OSAllocator::JSJITCodePages, EXECUTABLE_POOL_WRITABLE, true);
-#if !ENABLE(CLASSIC_INTERPRETER)
+#if !(ENABLE(CLASSIC_INTERPRETER) || ENABLE(LLINT))
         if (!m_reservation)
             CRASH();
 #endif

Modified: trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp (111430 => 111431)


--- trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp	2012-03-20 19:58:19 UTC (rev 111430)
+++ trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp	2012-03-20 20:02:05 UTC (rev 111431)
@@ -112,7 +112,7 @@
 
     result = mmap(result, bytes, protection, flags, fd, 0);
     if (result == MAP_FAILED) {
-    #if ENABLE(CLASSIC_INTERPRETER)
+    #if ENABLE(CLASSIC_INTERPRETER) || ENABLE(LLINT)
         if (executable)
             result = 0;
         else
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to