Changeset 95507 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

Timestamp:

Sep 19, 2011, 6:53:00 PM (14 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r95493 and r95496.
​http://trac.webkit.org/changeset/95493
​http://trac.webkit.org/changeset/95496
​https://bugs.webkit.org/show_bug.cgi?id=68418

Broke Windows build (Requested by rniwa on #webkit).

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

Source/JavaScriptCore:

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• debugger/Debugger.cpp:

(JSC::Debugger::recompileAllJSFunctions):

• heap/AllocationSpace.cpp: Removed.
• heap/AllocationSpace.h: Removed.
• heap/Heap.cpp:

(JSC::CountFunctor::TakeIfEmpty::TakeIfEmpty):
(JSC::CountFunctor::TakeIfEmpty::operator()):
(JSC::CountFunctor::TakeIfEmpty::returnValue):
(JSC::Heap::Heap):
(JSC::Heap::reportExtraMemoryCostSlowCase):
(JSC::Heap::tryAllocate):
(JSC::Heap::allocateSlowCase):
(JSC::Heap::getConservativeRegisterRoots):
(JSC::Heap::markRoots):
(JSC::Heap::clearMarks):
(JSC::Heap::sweep):
(JSC::Heap::objectCount):
(JSC::Heap::size):
(JSC::Heap::capacity):
(JSC::Heap::globalObjectCount):
(JSC::Heap::objectTypeCounts):
(JSC::Heap::collect):
(JSC::Heap::canonicalizeBlocks):
(JSC::Heap::resetAllocator):
(JSC::Heap::allocateBlock):
(JSC::Heap::freeBlocks):
(JSC::Heap::shrink):

• heap/Heap.h:

(JSC::Heap::markedSpace):
(JSC::Heap::forEachCell):
(JSC::Heap::forEachBlock):
(JSC::Heap::sizeClassFor):
(JSC::Heap::allocate):

• jit/JITInlineMethods.h:

(JSC::JIT::emitAllocateBasicJSObject):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::recompileAllJSFunctions):
(JSC::JSGlobalData::releaseExecutableMemory):

Source/WebCore:

• ForwardingHeaders/heap/AllocationSpace.h: Removed.

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -455 +455 @@
     ASSERT(!dynamicGlobalObject);
     
-    heap.objectSpace().forEachCell<Recompiler>();
+    heap.forEachCell<Recompiler>();
 }
 
@@ -496 +496 @@
                 
         }
-        heap.objectSpace().forEachCell<StackPreservingRecompiler>(recompiler);
+        heap.forEachCell<StackPreservingRecompiler>(recompiler);
     }
     m_regExpCache->invalidateCode();