Title: [109522] trunk/Source/_javascript_Core
- Revision
- 109522
- Author
- [email protected]
- Date
- 2012-03-02 00:15:29 -0800 (Fri, 02 Mar 2012)
Log Message
Unreviewed build fix for platforms that have DFG_JIT disabled but PARALLEL_GC enabled.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::visitAggregate):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (109521 => 109522)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-02 08:11:42 UTC (rev 109521)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-02 08:15:29 UTC (rev 109522)
@@ -1,3 +1,10 @@
+2012-03-02 Filip Pizlo <[email protected]>
+
+ Unreviewed build fix for platforms that have DFG_JIT disabled but PARALLEL_GC enabled.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::visitAggregate):
+
2012-03-01 Filip Pizlo <[email protected]>
DFGCodeBlocks should not trace CodeBlocks that are also going to be traced by
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (109521 => 109522)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2012-03-02 08:11:42 UTC (rev 109521)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2012-03-02 08:15:29 UTC (rev 109522)
@@ -1619,7 +1619,7 @@
void CodeBlock::visitAggregate(SlotVisitor& visitor)
{
-#if ENABLE(PARALLEL_GC)
+#if ENABLE(PARALLEL_GC) && ENABLE(DFG_JIT)
if (!!m_dfgData) {
// I may be asked to scan myself more than once, and it may even happen concurrently.
// To this end, use a CAS loop to check if I've been called already. Only one thread
@@ -1643,7 +1643,7 @@
}
} while (!WTF::weakCompareAndSwap(&m_dfgData->visitAggregateHasBeenCalled, 0, 1));
}
-#endif // ENABLE(PARALLEL_GC)
+#endif // ENABLE(PARALLEL_GC) && ENABLE(DFG_JIT)
if (!!m_alternative)
m_alternative->visitAggregate(visitor);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
