Changeset 108107 in webkit for trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp

Timestamp:

Feb 17, 2012, 12:09:14 PM (13 years ago)

Author:

[email protected]

Message:

Rename Bump* to Copy*
​https://bugs.webkit.org/show_bug.cgi?id=78573

Reviewed by Geoffrey Garen.

Renamed anything with "Bump" in the name to have "Copied" instead.

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• heap/BumpBlock.h: Removed.
• heap/BumpSpace.cpp: Removed.
• heap/BumpSpace.h: Removed.
• heap/BumpSpaceInlineMethods.h: Removed.
• heap/ConservativeRoots.cpp:

(JSC::ConservativeRoots::ConservativeRoots):
(JSC::ConservativeRoots::genericAddPointer):

• heap/ConservativeRoots.h:

(ConservativeRoots):

• heap/CopiedBlock.h: Added.

(JSC):
(CopiedBlock):
(JSC::CopiedBlock::CopiedBlock):

• heap/CopiedSpace.cpp: Added.

(JSC):
(JSC::CopiedSpace::tryAllocateSlowCase):

• heap/CopiedSpace.h: Added.

(JSC):
(CopiedSpace):
(JSC::CopiedSpace::isInCopyPhase):
(JSC::CopiedSpace::totalMemoryAllocated):
(JSC::CopiedSpace::totalMemoryUtilized):

• heap/CopiedSpaceInlineMethods.h: Added.

(JSC):
(JSC::CopiedSpace::CopiedSpace):
(JSC::CopiedSpace::init):
(JSC::CopiedSpace::contains):
(JSC::CopiedSpace::pin):
(JSC::CopiedSpace::startedCopying):
(JSC::CopiedSpace::doneCopying):
(JSC::CopiedSpace::doneFillingBlock):
(JSC::CopiedSpace::recycleBlock):
(JSC::CopiedSpace::getFreshBlock):
(JSC::CopiedSpace::borrowBlock):
(JSC::CopiedSpace::addNewBlock):
(JSC::CopiedSpace::allocateNewBlock):
(JSC::CopiedSpace::fitsInBlock):
(JSC::CopiedSpace::fitsInCurrentBlock):
(JSC::CopiedSpace::tryAllocate):
(JSC::CopiedSpace::tryAllocateOversize):
(JSC::CopiedSpace::allocateFromBlock):
(JSC::CopiedSpace::tryReallocate):
(JSC::CopiedSpace::tryReallocateOversize):
(JSC::CopiedSpace::isOversize):
(JSC::CopiedSpace::isPinned):
(JSC::CopiedSpace::oversizeBlockFor):
(JSC::CopiedSpace::blockFor):

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

(JSC):
(Heap):

• heap/MarkStack.cpp:

(JSC::MarkStackThreadSharedData::MarkStackThreadSharedData):
(JSC::SlotVisitor::drainFromShared):
(JSC::SlotVisitor::startCopying):
(JSC::SlotVisitor::allocateNewSpace):
(JSC::SlotVisitor::doneCopying):

• heap/MarkStack.h:

(MarkStackThreadSharedData):

• heap/SlotVisitor.h:

(SlotVisitor):

• runtime/JSArray.cpp:
• runtime/JSObject.cpp:

File:

• trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp

@@ -27 +27 @@
 #include "ConservativeRoots.h"
 
-#include "BumpSpace.h"
-#include "BumpSpaceInlineMethods.h"
+#include "CopiedSpace.h"
+#include "CopiedSpaceInlineMethods.h"
 #include "CodeBlock.h"
 #include "DFGCodeBlocks.h"
@@ -37 +37 @@
 namespace JSC {
 
-ConservativeRoots::ConservativeRoots(const MarkedBlockSet* blocks, BumpSpace* bumpSpace)
+ConservativeRoots::ConservativeRoots(const MarkedBlockSet* blocks, CopiedSpace* copiedSpace)
     : m_roots(m_inlineRoots)
     , m_size(0)
     , m_capacity(inlineCapacity)
     , m_blocks(blocks)
-    , m_bumpSpace(bumpSpace)
+    , m_copiedSpace(copiedSpace)
 {
 }
@@ -73 +73 @@
     markHook.mark(p);
     
-    BumpBlock* block;
-    if (m_bumpSpace->contains(p, block))
-        m_bumpSpace->pin(block);
+    CopiedBlock* block;
+    if (m_copiedSpace->contains(p, block))
+        m_copiedSpace->pin(block);
     
     MarkedBlock* candidate = MarkedBlock::blockFor(p);