Changeset 179211 in webkit for trunk/Source/JavaScriptCore/heap/CopiedBlock.h

Timestamp:

Jan 27, 2015, 1:34:32 PM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r179192.
​https://bugs.webkit.org/show_bug.cgi?id=140953

Caused numerous layout test failures (Requested by mattbaker_
on #webkit).

Reverted changeset:

"Use FastMalloc (bmalloc) instead of BlockAllocator for GC
pages"
​https://bugs.webkit.org/show_bug.cgi?id=140900
​http://trac.webkit.org/changeset/179192

File:

• trunk/Source/JavaScriptCore/heap/CopiedBlock.h (modified) (10 diffs)

trunk/Source/JavaScriptCore/heap/CopiedBlock.h

@@ -27 +27 @@
 #define CopiedBlock_h
 
+#include "BlockAllocator.h"
 #include "CopyWorkList.h"
 #include "HeapBlock.h"
@@ -32 +33 @@
 #include "Options.h"
 #include <wtf/Atomics.h>
-#include <wtf/TCSpinLock.h>
 
 namespace JSC {
@@ -42 +42 @@
     friend class CopiedAllocator;
 public:
-    static CopiedBlock* create(size_t);
-    static CopiedBlock* createNoZeroFill(size_t);
+    static CopiedBlock* create(DeadBlock*);
+    static CopiedBlock* createNoZeroFill(DeadBlock*);
 
     void pin();
@@ -87 +87 @@
 
 private:
-    CopiedBlock(size_t);
+    CopiedBlock(Region*);
     void zeroFillWilderness(); // Can be called at any time to zero-fill to the end of the block.
 
@@ -95 +95 @@
     std::unique_ptr<CopyWorkList> m_workList;
 
-    size_t m_blockSize;
     size_t m_remaining;
     bool m_isPinned : 1;
@@ -105 +104 @@
 };
 
-inline CopiedBlock* CopiedBlock::createNoZeroFill(size_t blockSize)
-{
-    return new(NotNull, fastAlignedMalloc(CopiedBlock::blockSize, blockSize)) CopiedBlock(blockSize);
-}
-
-inline CopiedBlock* CopiedBlock::create(size_t blockSize)
-{
-    CopiedBlock* newBlock = createNoZeroFill(blockSize);
+inline CopiedBlock* CopiedBlock::createNoZeroFill(DeadBlock* block)
+{
+    Region* region = block->region();
+    return new(NotNull, block) CopiedBlock(region);
+}
+
+inline CopiedBlock* CopiedBlock::create(DeadBlock* block)
+{
+    CopiedBlock* newBlock = createNoZeroFill(block);
     newBlock->zeroFillWilderness();
     return newBlock;
@@ -129 +129 @@
 }
 
-inline CopiedBlock::CopiedBlock(size_t blockSize)
-    : HeapBlock<CopiedBlock>()
-    , m_blockSize(blockSize)
+inline CopiedBlock::CopiedBlock(Region* region)
+    : HeapBlock<CopiedBlock>(region)
     , m_remaining(payloadCapacity())
     , m_isPinned(false)
@@ -205 +204 @@
 inline bool CopiedBlock::isOversize()
 {
-    return m_blockSize != blockSize;
+    return region()->isCustomSize();
 }
 
@@ -221 +220 @@
 inline char* CopiedBlock::payloadEnd()
 {
-    return reinterpret_cast<char*>(this) + m_blockSize;
+    return reinterpret_cast<char*>(this) + region()->blockSize();
 }
 
@@ -266 +265 @@
 inline size_t CopiedBlock::capacity()
 {
-    return m_blockSize;
+    return region()->blockSize();
 }