Title: [184491] branches/safari-601.1.32.2-branch/Source/_javascript_Core
- Revision
- 184491
- Author
- [email protected]
- Date
- 2015-05-18 10:00:19 -0700 (Mon, 18 May 2015)
Log Message
Merge r184019. rdar://problem/20764509
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/_javascript_Core/ChangeLog (184490 => 184491)
--- branches/safari-601.1.32.2-branch/Source/_javascript_Core/ChangeLog 2015-05-18 16:47:39 UTC (rev 184490)
+++ branches/safari-601.1.32.2-branch/Source/_javascript_Core/ChangeLog 2015-05-18 17:00:19 UTC (rev 184491)
@@ -1,3 +1,21 @@
+2015-05-18 Matthew Hanson <[email protected]>
+
+ Merge r184019. rdar://problem/20764509
+
+ 2015-05-08 Michael Saboff <[email protected]>
+
+ Creating a large MarkedBlock sometimes results in more than one cell in the block
+ https://bugs.webkit.org/show_bug.cgi?id=144815
+
+ Reviewed by Mark Lam.
+
+ Large MarkedBlocks should have one and only one cell. Changed the calculation of
+ m_endAtom for large blocks to use the location of the first cell + 1. This
+ assures that large blocks only have one cell.
+
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::MarkedBlock):
+
2015-05-12 Dana Burkart <[email protected]>
Merge r184137. rdar://problem/20707307
Modified: branches/safari-601.1.32.2-branch/Source/_javascript_Core/heap/MarkedBlock.cpp (184490 => 184491)
--- branches/safari-601.1.32.2-branch/Source/_javascript_Core/heap/MarkedBlock.cpp 2015-05-18 16:47:39 UTC (rev 184490)
+++ branches/safari-601.1.32.2-branch/Source/_javascript_Core/heap/MarkedBlock.cpp 2015-05-18 17:00:19 UTC (rev 184491)
@@ -47,7 +47,7 @@
MarkedBlock::MarkedBlock(MarkedAllocator* allocator, size_t capacity, size_t cellSize, bool needsDestruction)
: DoublyLinkedListNode<MarkedBlock>()
, m_atomsPerCell((cellSize + atomSize - 1) / atomSize)
- , m_endAtom((allocator->cellSize() ? atomsPerBlock : capacity / atomSize) - m_atomsPerCell + 1)
+ , m_endAtom((allocator->cellSize() ? atomsPerBlock - m_atomsPerCell : firstAtom()) + 1)
, m_capacity(capacity)
, m_needsDestruction(needsDestruction)
, m_allocator(allocator)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
