Title: [157422] trunk/Source/_javascript_Core
- Revision
- 157422
- Author
- [email protected]
- Date
- 2013-10-14 14:41:13 -0700 (Mon, 14 Oct 2013)
Log Message
COLLECT_ON_EVERY_ALLOCATION causes assertion failures
https://bugs.webkit.org/show_bug.cgi?id=122652
Reviewed by Filip Pizlo.
COLLECT_ON_EVERY_ALLOCATION wasn't accounting for the new GC deferral mechanism,
so we would end up ASSERTing during garbage collection.
* heap/MarkedAllocator.cpp:
(JSC::MarkedAllocator::allocateSlowCase):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (157421 => 157422)
--- trunk/Source/_javascript_Core/ChangeLog 2013-10-14 21:11:50 UTC (rev 157421)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-10-14 21:41:13 UTC (rev 157422)
@@ -1,3 +1,16 @@
+2013-10-14 Mark Hahnenberg <[email protected]>
+
+ COLLECT_ON_EVERY_ALLOCATION causes assertion failures
+ https://bugs.webkit.org/show_bug.cgi?id=122652
+
+ Reviewed by Filip Pizlo.
+
+ COLLECT_ON_EVERY_ALLOCATION wasn't accounting for the new GC deferral mechanism,
+ so we would end up ASSERTing during garbage collection.
+
+ * heap/MarkedAllocator.cpp:
+ (JSC::MarkedAllocator::allocateSlowCase):
+
2013-10-11 Oliver Hunt <[email protected]>
Separate out array iteration intrinsics
Modified: trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp (157421 => 157422)
--- trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp 2013-10-14 21:11:50 UTC (rev 157421)
+++ trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp 2013-10-14 21:41:13 UTC (rev 157422)
@@ -78,7 +78,8 @@
{
ASSERT(m_heap->vm()->currentThreadIsHoldingAPILock());
#if COLLECT_ON_EVERY_ALLOCATION
- m_heap->collectAllGarbage();
+ if (!m_heap->isDeferred())
+ m_heap->collectAllGarbage();
ASSERT(m_heap->m_operationInProgress == NoOperation);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
