Title: [118868] trunk/Source/_javascript_Core
- Revision
- 118868
- Author
- [email protected]
- Date
- 2012-05-29 18:05:35 -0700 (Tue, 29 May 2012)
Log Message
Rolled back in r118646, now that
https://bugs.webkit.org/show_bug.cgi?id=87784 is fixed.
http://trac.webkit.org/changeset/118646
https://bugs.webkit.org/show_bug.cgi?id=87599
* heap/Heap.cpp:
(JSC::Heap::collect):
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::sweep):
* heap/MarkedBlock.h:
(JSC):
* heap/MarkedSpace.cpp:
(JSC):
* heap/MarkedSpace.h:
(MarkedSpace):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (118867 => 118868)
--- trunk/Source/_javascript_Core/ChangeLog 2012-05-30 01:04:07 UTC (rev 118867)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-05-30 01:05:35 UTC (rev 118868)
@@ -1,3 +1,22 @@
+2012-05-29 Geoffrey Garen <[email protected]>
+
+ Rolled back in r118646, now that
+ https://bugs.webkit.org/show_bug.cgi?id=87784 is fixed.
+
+ http://trac.webkit.org/changeset/118646
+ https://bugs.webkit.org/show_bug.cgi?id=87599
+
+ * heap/Heap.cpp:
+ (JSC::Heap::collect):
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::sweep):
+ * heap/MarkedBlock.h:
+ (JSC):
+ * heap/MarkedSpace.cpp:
+ (JSC):
+ * heap/MarkedSpace.h:
+ (MarkedSpace):
+
2012-05-29 Filip Pizlo <[email protected]>
DFG should keep captured variables alive until the (inline) return.
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (118867 => 118868)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2012-05-30 01:04:07 UTC (rev 118867)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2012-05-30 01:05:35 UTC (rev 118868)
@@ -687,7 +687,6 @@
{
GCPHASE(FinalizeWeakHandles);
- m_objectSpace.sweepWeakSets();
m_globalData->smallStrings.finalizeSmallStrings();
}
Modified: trunk/Source/_javascript_Core/heap/MarkedBlock.cpp (118867 => 118868)
--- trunk/Source/_javascript_Core/heap/MarkedBlock.cpp 2012-05-30 01:04:07 UTC (rev 118867)
+++ trunk/Source/_javascript_Core/heap/MarkedBlock.cpp 2012-05-30 01:05:35 UTC (rev 118868)
@@ -114,6 +114,8 @@
{
HEAP_LOG_BLOCK_STATE_TRANSITION(this);
+ m_weakSet.sweep();
+
if (sweepMode == SweepOnly && !m_cellsNeedDestruction)
return FreeList();
Modified: trunk/Source/_javascript_Core/heap/MarkedBlock.h (118867 => 118868)
--- trunk/Source/_javascript_Core/heap/MarkedBlock.h 2012-05-30 01:04:07 UTC (rev 118867)
+++ trunk/Source/_javascript_Core/heap/MarkedBlock.h 2012-05-30 01:05:35 UTC (rev 118868)
@@ -133,7 +133,6 @@
void visitWeakSet(HeapRootVisitor&);
void reapWeakSet();
- void sweepWeakSet();
// While allocating from a free list, MarkedBlock temporarily has bogus
// cell liveness data. To restore accurate cell liveness data, call one
@@ -287,11 +286,6 @@
m_weakSet.reap();
}
- inline void MarkedBlock::sweepWeakSet()
- {
- m_weakSet.sweep();
- }
-
inline void MarkedBlock::didConsumeFreeList()
{
HEAP_LOG_BLOCK_STATE_TRANSITION(this);
Modified: trunk/Source/_javascript_Core/heap/MarkedSpace.cpp (118867 => 118868)
--- trunk/Source/_javascript_Core/heap/MarkedSpace.cpp 2012-05-30 01:04:07 UTC (rev 118867)
+++ trunk/Source/_javascript_Core/heap/MarkedSpace.cpp 2012-05-30 01:05:35 UTC (rev 118868)
@@ -77,10 +77,6 @@
void operator()(MarkedBlock* block) { block->reapWeakSet(); }
};
-struct SweepWeakSet : MarkedBlock::VoidFunctor {
- void operator()(MarkedBlock* block) { block->sweepWeakSet(); }
-};
-
MarkedSpace::MarkedSpace(Heap* heap)
: m_heap(heap)
{
@@ -142,11 +138,6 @@
forEachBlock<ReapWeakSet>();
}
-void MarkedSpace::sweepWeakSets()
-{
- forEachBlock<SweepWeakSet>();
-}
-
void MarkedSpace::canonicalizeCellLivenessData()
{
for (size_t cellSize = preciseStep; cellSize <= preciseCutoff; cellSize += preciseStep) {
Modified: trunk/Source/_javascript_Core/heap/MarkedSpace.h (118867 => 118868)
--- trunk/Source/_javascript_Core/heap/MarkedSpace.h 2012-05-30 01:04:07 UTC (rev 118867)
+++ trunk/Source/_javascript_Core/heap/MarkedSpace.h 2012-05-30 01:05:35 UTC (rev 118868)
@@ -85,7 +85,6 @@
void visitWeakSets(HeapRootVisitor&);
void reapWeakSets();
- void sweepWeakSets();
MarkedBlockSet& blocks() { return m_blocks; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
