Title: [155652] trunk/Source/_javascript_Core
- Revision
- 155652
- Author
- mhahnenb...@apple.com
- Date
- 2013-09-12 15:39:16 -0700 (Thu, 12 Sep 2013)
Log Message
Rolling out r155632
Broke some tests.
* heap/MarkedAllocator.cpp:
(JSC::MarkedAllocator::tryAllocateHelper):
* heap/MarkedBlock.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (155651 => 155652)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-12 22:09:25 UTC (rev 155651)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-12 22:39:16 UTC (rev 155652)
@@ -1,3 +1,13 @@
+2013-09-12 Mark Hahnenberg <mhahnenb...@apple.com>
+
+ Rolling out r155632
+
+ Broke some tests.
+
+ * heap/MarkedAllocator.cpp:
+ (JSC::MarkedAllocator::tryAllocateHelper):
+ * heap/MarkedBlock.h:
+
2013-09-12 Ryosuke Niwa <rn...@webkit.org>
Qt build fix. Add a return to make the compiler happy.
Modified: trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp (155651 => 155652)
--- trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp 2013-09-12 22:09:25 UTC (rev 155651)
+++ trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp 2013-09-12 22:39:16 UTC (rev 155652)
@@ -30,16 +30,10 @@
inline void* MarkedAllocator::tryAllocateHelper(size_t bytes)
{
if (!m_freeList.head) {
- if (m_currentBlock) {
- ASSERT(m_currentBlock == m_blocksToSweep);
- m_currentBlock->didConsumeFreeList();
- m_blocksToSweep = m_currentBlock->next();
- }
-
for (MarkedBlock*& block = m_blocksToSweep; block; block = block->next()) {
MarkedBlock::FreeList freeList = block->sweep(MarkedBlock::SweepToFreeList);
if (!freeList.head) {
- block->didConsumeEmptyFreeList();
+ block->didConsumeFreeList();
continue;
}
Modified: trunk/Source/_javascript_Core/heap/MarkedBlock.h (155651 => 155652)
--- trunk/Source/_javascript_Core/heap/MarkedBlock.h 2013-09-12 22:09:25 UTC (rev 155651)
+++ trunk/Source/_javascript_Core/heap/MarkedBlock.h 2013-09-12 22:39:16 UTC (rev 155652)
@@ -133,7 +133,6 @@
// of these functions:
void didConsumeFreeList(); // Call this once you've allocated all the items in the free list.
void canonicalizeCellLivenessData(const FreeList&);
- void didConsumeEmptyFreeList(); // Call this if you sweep a block, but the returned FreeList is empty.
// Returns true if the "newly allocated" bitmap was non-null
// and was successfully cleared and false otherwise.
@@ -278,14 +277,6 @@
m_state = Allocated;
}
- inline void MarkedBlock::didConsumeEmptyFreeList()
- {
- HEAP_LOG_BLOCK_STATE_TRANSITION(this);
-
- ASSERT(m_state == FreeListed);
- m_state = Marked;
- }
-
inline void MarkedBlock::clearMarks()
{
HEAP_LOG_BLOCK_STATE_TRANSITION(this);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
