Changeset 94522 in webkit for trunk/Source/JavaScriptCore/heap/Heap.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/Heap.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -92 +92 @@
         void collectAllGarbage();
 
-        inline void* allocatePropertyStorage(size_t);
-        inline bool inPropertyStorageNursery(void*);
-
         void reportExtraMemoryCost(size_t cost);
 
@@ -363 +360 @@
     }
 
-    inline void* Heap::allocatePropertyStorage(size_t bytes)
-    {
-        ASSERT(!(bytes % sizeof(JSValue)));
-        if (bytes >= NewSpace::PropertyStorageNurserySize)
-            return fastMalloc(bytes);
-        if (void* result = m_newSpace.allocatePropertyStorage(bytes))
-            return result;
-        collect(DoNotSweep);
-        return m_newSpace.allocatePropertyStorage(bytes);
-    }
-    
-    inline bool Heap::inPropertyStorageNursery(void* ptr)
-    {
-        return m_newSpace.inPropertyStorageNursery(ptr);
-    }
-
 } // namespace JSC