Title: [160658] branches/jsCStack/Source/_javascript_Core
- Revision
- 160658
- Author
- msab...@apple.com
- Date
- 2013-12-16 13:23:53 -0800 (Mon, 16 Dec 2013)
Log Message
CStack Branch: REGRESSION(r160600) ASSERT failure in Heap::collect()
https://bugs.webkit.org/show_bug.cgi?id=125789
Reviewed by Geoffrey Garen.
Restored the shouldCollect() check so we don't collect on start up.
Eliminated the Options::disableGC() check since it is part of the
isDeferred() check.
* heap/Heap.cpp:
(JSC::Heap::collectIfNecessaryOrDefer):
Modified Paths
Diff
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (160657 => 160658)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-16 20:47:00 UTC (rev 160657)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-16 21:23:53 UTC (rev 160658)
@@ -1,3 +1,17 @@
+2013-12-16 Michael Saboff <msab...@apple.com>
+
+ CStack Branch: REGRESSION(r160600) ASSERT failure in Heap::collect()
+ https://bugs.webkit.org/show_bug.cgi?id=125789
+
+ Reviewed by Geoffrey Garen.
+
+ Restored the shouldCollect() check so we don't collect on start up.
+ Eliminated the Options::disableGC() check since it is part of the
+ isDeferred() check.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::collectIfNecessaryOrDefer):
+
2013-12-14 Mark Lam <mark....@apple.com>
Fix exception handling for the baseline JIT.
Modified: branches/jsCStack/Source/_javascript_Core/heap/Heap.cpp (160657 => 160658)
--- branches/jsCStack/Source/_javascript_Core/heap/Heap.cpp 2013-12-16 20:47:00 UTC (rev 160657)
+++ branches/jsCStack/Source/_javascript_Core/heap/Heap.cpp 2013-12-16 21:23:53 UTC (rev 160658)
@@ -877,10 +877,10 @@
{
if (isDeferred())
return false;
-
- if (Options::disableGC())
+
+ if (!shouldCollect())
return false;
-
+
collect(DoNotSweep);
return true;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
