Changeset 74431 in webkit for trunk/JavaScriptCore/wtf/PageReservation.h

Timestamp:

Dec 21, 2010, 3:53:25 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Added PageAllocationAligned, a cross-platform abstraction for memory allocations with arbitrary alignment requirements
​https://bugs.webkit.org/show_bug.cgi?id=51359

Patch by Geoffrey Garen <​[email protected]> on 2010-12-21
Reviewed by Gavin Barraclough & Oliver Hunt.

I think this patch fixes <rdar://problem/8107952> [5.0.1] WER crash in
Heap::allocateBlock (1902752929), and some other leaks and crashes as well.

• Android.mk:
• CMakeLists.txt:
• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj: Updated build files.

• runtime/AlignedMemoryAllocator.h: Removed. Supplanted by

PageAllocationAligned.

• runtime/Collector.cpp:

(JSC::Heap::destroy):
(JSC::Heap::allocateBlock):
(JSC::Heap::freeBlock):
(JSC::Heap::addWeakGCHandle):

• runtime/Collector.h: Switched from AlignedMemoryAllocator to

PageAllocationAligned.

• runtime/GCHandle.cpp:
• runtime/GCHandle.h: Ditto.

• wtf/PageAllocation.h:

(WTF::PageAllocation::PageAllocation): Removed aligned memory allocation
functions. Supplanted by PageAllocationAligned.

• wtf/PageAllocationAligned.cpp: Added.

(WTF::PageAllocationAligned::allocate):
(WTF::PageAllocationAligned::deallocate):

• wtf/PageAllocationAligned.h: Added.

(WTF::PageAllocationAligned::PageAllocationAligned): New cross-platform
class for doing aligned memory allocation. This class properly matches
allocation and deallocation library calls, fixing a long-standing bug
in PageAllocation.

• wtf/Platform.h: Removed some defunction VM platform defines.

• wtf/wtf.pri: Updated build files.

JavaScriptGlue: Added PageAllocationAligned, a cross-platform abstraction for memory allocations with arbitrary alignment requirements
​https://bugs.webkit.org/show_bug.cgi?id=51359

Patch by Geoffrey Garen <​[email protected]> on 2010-12-21
Reviewed by Gavin Barraclough & Oliver Hunt.

• ForwardingHeaders/wtf/PageAllocationAligned.h: Added.

WebCore: Added PageAllocationAligned, a cross-platform abstraction for memory allocations with arbitrary alignment requirements
​https://bugs.webkit.org/show_bug.cgi?id=51359

Patch by Geoffrey Garen <​[email protected]> on 2010-12-21
Reviewed by Gavin Barraclough & Oliver Hunt.

• ForwardingHeaders/wtf/PageAllocationAligned.h: Added.

File:

• trunk/JavaScriptCore/wtf/PageReservation.h (modified) (6 diffs)

trunk/JavaScriptCore/wtf/PageReservation.h

@@ -58 +58 @@
 public:
     PageReservation()
+        : m_writable(false)
+        , m_executable(false)
+#ifndef NDEBUG
+        , m_committed(0)
+#endif
     {
     }
@@ -70 +75 @@
         ASSERT(isPageAligned(start));
         ASSERT(isPageAligned(size));
+        ASSERT(contains(start, size));
 
 #ifndef NDEBUG
@@ -82 +88 @@
         ASSERT(isPageAligned(start));
         ASSERT(isPageAligned(size));
+        ASSERT(contains(start, size));
 
 #ifndef NDEBUG
@@ -92 +99 @@
     {
         ASSERT(isPageAligned(size));
-        return PageReservation(OSAllocator::reserve(size, usage, writable, executable), size, writable, executable);
+        return PageReservation(OSAllocator::reserveUncommitted(size, usage, writable, executable), size, writable, executable);
     }
 
@@ -98 +105 @@
     {
         ASSERT(!m_committed);
-        ASSERT(*this);
 
-        // Zero these before calling release; if this is *inside* allocation,
-        // we won't be able to clear then after the call to OSAllocator::release.
-        void* base = m_base;
-        size_t size = m_size;
-        m_base = 0;
-        m_size = 0;
+        // Clear base & size before calling release; if this is *inside* allocation
+        // then we won't be able to clear then after deallocating the memory.
+        PageReservation tmp;
+        std::swap(tmp, *this);
 
-        OSAllocator::release(base, size);
+        ASSERT(tmp);
+        ASSERT(!*this);
+
+        OSAllocator::releaseDecommitted(tmp.base(), tmp.size());
     }
 
@@ -113 +120 @@
     PageReservation(void* base, size_t size, bool writable, bool executable)
         : PageBlock(base, size)
+        , m_writable(writable)
+        , m_executable(executable)
 #ifndef NDEBUG
         , m_committed(0)
 #endif
-        , m_writable(writable)
-        , m_executable(executable)
     {
     }
 
+    bool m_writable;
+    bool m_executable;
 #ifndef NDEBUG
     size_t m_committed;
 #endif
-    bool m_writable;
-    bool m_executable;
 };