Title: [210554] trunk/Source/_javascript_Core
- Revision
- 210554
- Author
- commit-qu...@webkit.org
- Date
- 2017-01-10 11:13:06 -0800 (Tue, 10 Jan 2017)
Log Message
Unreviewed, rolling out r210540.
https://bugs.webkit.org/show_bug.cgi?id=166896
too crude for non-WebCore clients (Requested by kling on
#webkit).
Reverted changeset:
"Crash when GC heap grows way too large."
https://bugs.webkit.org/show_bug.cgi?id=166875
http://trac.webkit.org/changeset/210540
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (210553 => 210554)
--- trunk/Source/_javascript_Core/ChangeLog 2017-01-10 18:44:45 UTC (rev 210553)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-01-10 19:13:06 UTC (rev 210554)
@@ -1,3 +1,17 @@
+2017-01-10 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r210540.
+ https://bugs.webkit.org/show_bug.cgi?id=166896
+
+ too crude for non-WebCore clients (Requested by kling on
+ #webkit).
+
+ Reverted changeset:
+
+ "Crash when GC heap grows way too large."
+ https://bugs.webkit.org/show_bug.cgi?id=166875
+ http://trac.webkit.org/changeset/210540
+
2017-01-09 Filip Pizlo <fpi...@apple.com>
JSArray has some object scanning races
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (210553 => 210554)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2017-01-10 18:44:45 UTC (rev 210553)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2017-01-10 19:13:06 UTC (rev 210554)
@@ -1646,11 +1646,6 @@
m_sweeper->startSweeping();
}
-NEVER_INLINE void Heap::didExceedHeapSizeLimit()
-{
- CRASH();
-}
-
void Heap::updateAllocationLimits()
{
static const bool verbose = false;
@@ -1682,12 +1677,6 @@
if (verbose)
dataLog("extraMemorySize() = ", extraMemorySize(), ", currentHeapSize = ", currentHeapSize, "\n");
-
-#if USE(JSVALUE64)
- // If the heap has grown larger than 4GB, just crash before things get out of control.
- if (currentHeapSize > 4096 * MB)
- didExceedHeapSizeLimit();
-#endif
if (Options::gcMaxHeapSize() && currentHeapSize > Options::gcMaxHeapSize())
HeapStatistics::exitWithFailure();
Modified: trunk/Source/_javascript_Core/heap/Heap.h (210553 => 210554)
--- trunk/Source/_javascript_Core/heap/Heap.h 2017-01-10 18:44:45 UTC (rev 210553)
+++ trunk/Source/_javascript_Core/heap/Heap.h 2017-01-10 19:13:06 UTC (rev 210554)
@@ -507,8 +507,6 @@
void assertSharedMarkStacksEmpty();
- NO_RETURN_DUE_TO_CRASH void didExceedHeapSizeLimit();
-
const HeapType m_heapType;
const size_t m_ramSize;
const size_t m_minBytesPerCycle;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
