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

Timestamp:

Sep 5, 2011, 3:43:34 AM (14 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r94445 and r94448.
​http://trac.webkit.org/changeset/94445
​http://trac.webkit.org/changeset/94448
​https://bugs.webkit.org/show_bug.cgi?id=67595

It broke everything (Requested by ossy on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2011-09-05

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• heap/Heap.cpp:

(JSC::Heap::collect):

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

(JSC::NewSpace::NewSpace):

• heap/NewSpace.h:
• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/JSObject.cpp:

(JSC::JSObject::allocatePropertyStorage):

• runtime/JSObject.h:

(JSC::JSObject::~JSObject):
(JSC::JSObject::putDirectInternal):
(JSC::JSObject::putDirectWithoutTransition):
(JSC::JSObject::putDirectFunctionWithoutTransition):
(JSC::JSObject::transitionTo):
(JSC::JSObject::visitChildrenDirect):

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 = 1024 * 1024 * 4;
 
         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 +92 @@
         SizeClass m_preciseSizeClasses[preciseCount];
         SizeClass m_impreciseSizeClasses[impreciseCount];
-        char* m_propertyStorageNursery;
-        char* m_propertyStorageAllocationPoint;
         size_t m_waterMark;
         size_t m_highWaterMark;
@@ -168 +161 @@
     }
 
-    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)
     {