Changeset 106078 in webkit for trunk/Source/JavaScriptCore/heap/Heap.h

Timestamp:

Jan 26, 2012, 6:30:38 PM (13 years ago)

Author:

[email protected]

Message:

Merge AllocationSpace into MarkedSpace
​https://bugs.webkit.org/show_bug.cgi?id=77116

Reviewed by Geoffrey Garen.

Merging AllocationSpace and MarkedSpace in preparation for future refactoring/enhancement to
MarkedSpace allocation.

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• heap/AllocationSpace.cpp: Removed.
• heap/AllocationSpace.h: Removed.
• heap/BumpSpace.h:

(BumpSpace):

• heap/Heap.h:

(JSC::Heap::objectSpace):
(Heap):
():

• heap/HeapBlock.h:

():

• heap/MarkedSpace.cpp:

(JSC::MarkedSpace::tryAllocateHelper):
(JSC):
(JSC::MarkedSpace::tryAllocate):
(JSC::MarkedSpace::allocateSlowCase):
(JSC::MarkedSpace::allocateBlock):
(JSC::MarkedSpace::freeBlocks):
(TakeIfUnmarked):
(JSC::TakeIfUnmarked::TakeIfUnmarked):
(JSC::TakeIfUnmarked::operator()):
(JSC::TakeIfUnmarked::returnValue):
(JSC::MarkedSpace::shrink):
(GatherDirtyCells):
(JSC::GatherDirtyCells::returnValue):
(JSC::GatherDirtyCells::GatherDirtyCells):
(JSC::GatherDirtyCells::operator()):
(JSC::MarkedSpace::gatherDirtyCells):

• heap/MarkedSpace.h:

(MarkedSpace):
(JSC::MarkedSpace::blocks):
(JSC::MarkedSpace::forEachCell):
(JSC):
(JSC::MarkedSpace::allocate):

File:

• trunk/Source/JavaScriptCore/heap/Heap.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -23 +23 @@
 #define Heap_h
 
-#include "AllocationSpace.h"
 #include "DFGCodeBlocks.h"
 #include "HandleHeap.h"
@@ -87 +86 @@
 
         JSGlobalData* globalData() const { return m_globalData; }
-        AllocationSpace& objectSpace() { return m_objectSpace; }
+        MarkedSpace& objectSpace() { return m_objectSpace; }
         MachineThreads& machineThreads() { return m_machineThreads; }
 
@@ -137 +136 @@
 
     private:
+        friend class MarkedSpace;
         friend class MarkedBlock;
-        friend class AllocationSpace;
         friend class BumpSpace;
         friend class SlotVisitor;
@@ -192 +191 @@
         
         OperationInProgress m_operationInProgress;
-        AllocationSpace m_objectSpace;
+        MarkedSpace m_objectSpace;
         BumpSpace m_storageSpace;