Index: src/heap/concurrent-marking.cc |
diff --git a/src/heap/concurrent-marking.cc b/src/heap/concurrent-marking.cc |
index 32afac63f3eae03b5e351ef33d9009e79372b0fb..1c1bf1b2df11a68c5a5dc9fb20a415e0c1acc705 100644 |
--- a/src/heap/concurrent-marking.cc |
+++ b/src/heap/concurrent-marking.cc |
@@ -236,10 +236,10 @@ ConcurrentMarking::ConcurrentMarking(Heap* heap, ConcurrentMarkingDeque* deque) |
deque_(deque), |
visitor_(new ConcurrentMarkingVisitor(deque_)), |
is_task_pending_(false) { |
- // Concurrent marking does not work with double unboxing. |
- STATIC_ASSERT(!(V8_CONCURRENT_MARKING && V8_DOUBLE_FIELDS_UNBOXING)); |
// The runtime flag should be set only if the compile time flag was set. |
- CHECK(!FLAG_concurrent_marking || V8_CONCURRENT_MARKING); |
+#ifndef V8_CONCURRENT_MARKING |
+ CHECK(!FLAG_concurrent_marking); |
+#endif |
} |
ConcurrentMarking::~ConcurrentMarking() { delete visitor_; } |