Title: [164864] trunk/Source/_javascript_Core
- Revision
- 164864
- Author
- [email protected]
- Date
- 2014-02-28 09:46:12 -0800 (Fri, 28 Feb 2014)
Log Message
Fix !ENABLE(GGC) builds
* heap/Heap.cpp:
(JSC::Heap::markRoots):
(JSC::Heap::gatherJSStackRoots): Also fix one of the names of the GC phases.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164863 => 164864)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-28 17:30:36 UTC (rev 164863)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-28 17:46:12 UTC (rev 164864)
@@ -1,3 +1,11 @@
+2014-02-28 Mark Hahnenberg <[email protected]>
+
+ Fix !ENABLE(GGC) builds
+
+ * heap/Heap.cpp:
+ (JSC::Heap::markRoots):
+ (JSC::Heap::gatherJSStackRoots): Also fix one of the names of the GC phases.
+
2014-02-27 Mark Hahnenberg <[email protected]>
Clean up Heap::collect and Heap::markRoots
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (164863 => 164864)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2014-02-28 17:30:36 UTC (rev 164863)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2014-02-28 17:46:12 UTC (rev 164864)
@@ -452,6 +452,8 @@
#if ENABLE(GGC)
Vector<const JSCell*> rememberedSet(m_slotVisitor.markStack().size());
m_slotVisitor.markStack().fillVector(rememberedSet);
+#else
+ Vector<const JSCell*> rememberedSet;
#endif
{
@@ -512,7 +514,7 @@
void Heap::gatherJSStackRoots(ConservativeRoots& roots)
{
#if ENABLE(LLINT_C_LOOP)
- GCPHASE(GatherStackRoots);
+ GCPHASE(GatherJSStackRoots);
stack().gatherConservativeRoots(roots, m_jitStubRoutines, m_codeBlocks);
#else
UNUSED_PARAM(roots);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
