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

Timestamp:

Jan 27, 2015, 1:34:32 PM (10 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/Heap.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -24 +24 @@
 
 #include "ArrayBuffer.h"
+#include "BlockAllocator.h"
 #include "CodeBlockSet.h"
 #include "CopyVisitor.h"
@@ -215 +216 @@
     bool isDeferred() const { return !!m_deferralDepth || Options::disableGC(); }
 
+    BlockAllocator& blockAllocator();
     StructureIDTable& structureIDTable() { return m_structureIDTable; }
 
@@ -244 +246 @@
     friend class RecursiveAllocationScope;
     friend class SlotVisitor;
+    friend class SuperRegion;
     friend class IncrementalSweeper;
     friend class HeapStatistics;
@@ -340 +343 @@
     
     HeapOperation m_operationInProgress;
+    BlockAllocator m_blockAllocator;
     StructureIDTable m_structureIDTable;
     MarkedSpace m_objectSpace;