Title: [167293] trunk/Source/_javascript_Core
- Revision
- 167293
- Author
- [email protected]
- Date
- 2014-04-14 20:53:47 -0700 (Mon, 14 Apr 2014)
Log Message
ASSERT when firing low memory warning
https://bugs.webkit.org/show_bug.cgi?id=131659
Reviewed by Mark Hahnenberg.
* heap/Heap.cpp:
(JSC::Heap::deleteAllCompiledCode): Allow deleteAllCompiledCode to be
called when no GC is happening because that is what we do when a low
memory warning fires, and it is harmless.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (167292 => 167293)
--- trunk/Source/_javascript_Core/ChangeLog 2014-04-15 03:52:39 UTC (rev 167292)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-04-15 03:53:47 UTC (rev 167293)
@@ -1,3 +1,15 @@
+2014-04-14 Geoffrey Garen <[email protected]>
+
+ ASSERT when firing low memory warning
+ https://bugs.webkit.org/show_bug.cgi?id=131659
+
+ Reviewed by Mark Hahnenberg.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::deleteAllCompiledCode): Allow deleteAllCompiledCode to be
+ called when no GC is happening because that is what we do when a low
+ memory warning fires, and it is harmless.
+
2014-04-14 Mark Hahnenberg <[email protected]>
emit_op_put_by_id should not emit a write barrier that filters on value
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (167292 => 167293)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2014-04-15 03:52:39 UTC (rev 167292)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2014-04-15 03:53:47 UTC (rev 167293)
@@ -886,7 +886,7 @@
static_cast<FunctionExecutable*>(current)->clearCodeIfNotCompiling();
}
- ASSERT(m_operationInProgress == FullCollection);
+ ASSERT(m_operationInProgress == FullCollection || m_operationInProgress == NoOperation);
m_codeBlocks.clearMarksForFullCollection();
m_codeBlocks.deleteUnmarkedAndUnreferenced(FullCollection);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
