Title: [117134] branches/safari-536-branch/Source/_javascript_Core
Diff
Modified: branches/safari-536-branch/Source/_javascript_Core/ChangeLog (117133 => 117134)
--- branches/safari-536-branch/Source/_javascript_Core/ChangeLog 2012-05-15 20:09:13 UTC (rev 117133)
+++ branches/safari-536-branch/Source/_javascript_Core/ChangeLog 2012-05-15 20:10:52 UTC (rev 117134)
@@ -1,5 +1,19 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116813
+
+ 2012-05-11 Filip Pizlo <[email protected]>
+
+ JIT memory allocator is not returning memory to the OS on Darwin
+ https://bugs.webkit.org/show_bug.cgi?id=86047
+
+ Reviewed by Geoff Garen.
+
+ * jit/ExecutableAllocatorFixedVMPool.cpp:
+ (JSC::FixedVMPoolExecutableAllocator::notifyPageIsFree):
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116593
2012-05-09 Filip Pizlo <[email protected]>
Modified: branches/safari-536-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp (117133 => 117134)
--- branches/safari-536-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2012-05-15 20:09:13 UTC (rev 117133)
+++ branches/safari-536-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2012-05-15 20:10:52 UTC (rev 117134)
@@ -93,7 +93,10 @@
if (!result)
return;
ASSERT(result == -1);
- ASSERT(errno == EAGAIN);
+ if (errno != EAGAIN) {
+ ASSERT_NOT_REACHED(); // In debug mode, this should be a hard failure.
+ break; // In release mode, we should just ignore the error - not returning memory to the OS is better than crashing, especially since we _will_ be able to reuse the memory internally anyway.
+ }
}
#else
m_reservation.decommit(page, pageSize());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
