Title: [203012] trunk/Source/_javascript_Core
- Revision
- 203012
- Author
- [email protected]
- Date
- 2016-07-08 17:24:25 -0700 (Fri, 08 Jul 2016)
Log Message
ASSERTION FAILED: Heap::isMarked(cell) in SlotVisitor::appendToMarkStack(JSC::JSCell *)
https://bugs.webkit.org/show_bug.cgi?id=159588
Reviewed by Geoffrey Garen.
We were jettisoning a CodeBlock during GC that won't survive and its owning script
won't survive either. We can't install any code on the owning script as that involves
a write barrier that will "pull" the script back into the remembered set. Badness would
ensue. Added an early return in CodeBlock::jettison() when we are garbage collecting
and the owning script isn't marked.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::jettison):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (203011 => 203012)
--- trunk/Source/_javascript_Core/ChangeLog 2016-07-09 00:19:13 UTC (rev 203011)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-07-09 00:24:25 UTC (rev 203012)
@@ -1,3 +1,19 @@
+2016-07-08 Michael Saboff <[email protected]>
+
+ ASSERTION FAILED: Heap::isMarked(cell) in SlotVisitor::appendToMarkStack(JSC::JSCell *)
+ https://bugs.webkit.org/show_bug.cgi?id=159588
+
+ Reviewed by Geoffrey Garen.
+
+ We were jettisoning a CodeBlock during GC that won't survive and its owning script
+ won't survive either. We can't install any code on the owning script as that involves
+ a write barrier that will "pull" the script back into the remembered set. Badness would
+ ensue. Added an early return in CodeBlock::jettison() when we are garbage collecting
+ and the owning script isn't marked.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::jettison):
+
2016-07-08 Mark Lam <[email protected]>
Move CallFrame header info from JSStack.h to CallFrame.h
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (203011 => 203012)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2016-07-09 00:19:13 UTC (rev 203011)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2016-07-09 00:24:25 UTC (rev 203012)
@@ -3477,6 +3477,11 @@
tallyFrequentExitSites();
#endif // ENABLE(DFG_JIT)
+ // Jettison can happen during GC. We don't want to install code to a dead executable
+ // because that would add a dead object to the remembered set.
+ if (m_vm->heap.isCollecting() && !Heap::isMarked(ownerScriptExecutable()))
+ return;
+
// This accomplishes (2).
ownerScriptExecutable()->installCode(
m_globalObject->vm(), alternative(), codeType(), specializationKind());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes