Changeset 95439 in webkit for trunk/Source/JavaScriptCore/heap/NewSpace.h

Timestamp:

Sep 19, 2011, 10:41:51 AM (14 years ago)

Author:

[email protected]

Message:

Remove bump allocator
​https://bugs.webkit.org/show_bug.cgi?id=68370

Reviewed by Sam Weinig.

Can't do anything with this allocator currently, and it's
increasing the complexity of the GC code. Slight progression
on SunSpider, slight regression (undoing the original progression)
in V8.

• heap/Heap.cpp:

(JSC::Heap::collect):

• heap/Heap.h:
• heap/NewSpace.cpp:

(JSC::NewSpace::NewSpace):

• heap/NewSpace.h:

(JSC::NewSpace::allocate):

• runtime/JSObject.cpp:

(JSC::JSObject::allocatePropertyStorage):

• runtime/JSObject.h:

(JSC::JSObject::~JSObject):
(JSC::JSObject::visitChildrenDirect):

• runtime/StorageBarrier.h:

(JSC::StorageBarrier::set):

File:

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

trunk/Source/JavaScriptCore/heap/NewSpace.h

@@ -47 +47 @@
     public:
         static const size_t maxCellSize = 1024;
-        static const size_t PropertyStorageNurserySize = 4 * MB;
 
         struct SizeClass {
@@ -65 +64 @@
         SizeClass& sizeClassFor(size_t);
         void* allocate(SizeClass&);
-        inline void* allocatePropertyStorage(size_t);
-        inline bool inPropertyStorageNursery(void* ptr);
-        inline void resetPropertyStorageNursery();
         
         void resetAllocator();
@@ -97 +93 @@
         SizeClass m_preciseSizeClasses[preciseCount];
         SizeClass m_impreciseSizeClasses[impreciseCount];
-        char* m_propertyStorageNursery;
-        char* m_propertyStorageAllocationPoint;
         size_t m_waterMark;
         size_t m_highWaterMark;
@@ -167 +161 @@
         return firstFreeCell;
     }
-
-    inline void NewSpace::resetPropertyStorageNursery()
-    {
-        m_propertyStorageAllocationPoint = m_propertyStorageNursery;
-    }
-    
-    inline void* NewSpace::allocatePropertyStorage(size_t size)
-    {
-        char* result = m_propertyStorageAllocationPoint;
-        if (size > PropertyStorageNurserySize)
-            CRASH();
-        m_propertyStorageAllocationPoint += size;
-        if (static_cast<size_t>(m_propertyStorageAllocationPoint - m_propertyStorageNursery) > PropertyStorageNurserySize) {
-            m_propertyStorageAllocationPoint = result;
-            return 0;
-        }
-        return result;
-    }
-
-    inline bool NewSpace::inPropertyStorageNursery(void* ptr)
-    {
-        char* addr = static_cast<char*>(ptr);
-        return static_cast<size_t>(addr - m_propertyStorageNursery) < PropertyStorageNurserySize;
-    }
     
     template <typename Functor> inline typename Functor::ReturnType NewSpace::forEachBlock(Functor& functor)