Index: test/cctest/heap/test-heap.cc |
diff --git a/test/cctest/heap/test-heap.cc b/test/cctest/heap/test-heap.cc |
index 100c4441bbd779b194847d84318ef5cac8a8e0a2..399521b806692346d7fddb6bc0d2e56ec9048d48 100644 |
--- a/test/cctest/heap/test-heap.cc |
+++ b/test/cctest/heap/test-heap.cc |
@@ -1362,6 +1362,7 @@ TEST(TestCodeFlushingPreAged) { |
TEST(TestCodeFlushingIncremental) { |
+ if (!i::FLAG_incremental_marking) return; |
// If we do not flush code this test is invalid. |
if (!FLAG_flush_code) return; |
i::FLAG_allow_natives_syntax = true; |
@@ -1434,6 +1435,7 @@ TEST(TestCodeFlushingIncremental) { |
TEST(TestCodeFlushingIncrementalScavenge) { |
+ if (!FLAG_incremental_marking) return; |
// If we do not flush code this test is invalid. |
if (!FLAG_flush_code) return; |
i::FLAG_allow_natives_syntax = true; |
@@ -1505,6 +1507,7 @@ TEST(TestCodeFlushingIncrementalScavenge) { |
TEST(TestCodeFlushingIncrementalAbort) { |
+ if (!i::FLAG_incremental_marking) return; |
// If we do not flush code this test is invalid. |
if (!FLAG_flush_code) return; |
i::FLAG_allow_natives_syntax = true; |
@@ -1571,6 +1574,7 @@ TEST(TestCodeFlushingIncrementalAbort) { |
} |
TEST(TestUseOfIncrementalBarrierOnCompileLazy) { |
+ if (!i::FLAG_incremental_marking) return; |
// Turn off always_opt because it interferes with running the built-in for |
// the last call to g(). |
i::FLAG_always_opt = false; |
@@ -2608,6 +2612,7 @@ TEST(LeakNativeContextViaMapProto) { |
TEST(InstanceOfStubWriteBarrier) { |
+ if (!i::FLAG_incremental_marking) return; |
i::FLAG_allow_natives_syntax = true; |
#ifdef VERIFY_HEAP |
i::FLAG_verify_heap = true; |
@@ -2674,6 +2679,7 @@ int GetProfilerTicks(SharedFunctionInfo* shared) { |
} // namespace |
TEST(ResetSharedFunctionInfoCountersDuringIncrementalMarking) { |
+ if (!i::FLAG_incremental_marking) return; |
i::FLAG_stress_compaction = false; |
i::FLAG_allow_natives_syntax = true; |
#ifdef VERIFY_HEAP |
@@ -2765,6 +2771,7 @@ TEST(ResetSharedFunctionInfoCountersDuringMarkSweep) { |
HEAP_TEST(GCFlags) { |
+ if (!i::FLAG_incremental_marking) return; |
CcTest::InitializeVM(); |
Heap* heap = CcTest::heap(); |
@@ -2797,6 +2804,7 @@ HEAP_TEST(GCFlags) { |
TEST(IdleNotificationFinishMarking) { |
+ if (!i::FLAG_incremental_marking) return; |
i::FLAG_allow_natives_syntax = true; |
CcTest::InitializeVM(); |
const int initial_gc_count = CcTest::heap()->gc_count(); |
@@ -3296,6 +3304,7 @@ static int CountMapTransitions(Map* map) { |
// Test that map transitions are cleared and maps are collected with |
// incremental marking as well. |
TEST(Regress1465) { |
+ if (!i::FLAG_incremental_marking) return; |
i::FLAG_stress_compaction = false; |
i::FLAG_allow_natives_syntax = true; |
i::FLAG_trace_incremental_marking = true; |
@@ -3671,6 +3680,7 @@ TEST(PrintSharedFunctionInfo) { |
TEST(IncrementalMarkingPreservesMonomorphicCallIC) { |
+ if (!FLAG_incremental_marking) return; |
if (i::FLAG_always_opt) return; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -3746,6 +3756,7 @@ static void CheckVectorIC(Handle<JSFunction> f, int slot_index, |
} |
TEST(IncrementalMarkingPreservesMonomorphicConstructor) { |
+ if (!i::FLAG_incremental_marking) return; |
if (i::FLAG_always_opt) return; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -3769,6 +3780,7 @@ TEST(IncrementalMarkingPreservesMonomorphicConstructor) { |
} |
TEST(IncrementalMarkingPreservesMonomorphicIC) { |
+ if (!i::FLAG_incremental_marking) return; |
if (i::FLAG_always_opt) return; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -3790,6 +3802,7 @@ TEST(IncrementalMarkingPreservesMonomorphicIC) { |
} |
TEST(IncrementalMarkingPreservesPolymorphicIC) { |
+ if (!i::FLAG_incremental_marking) return; |
if (i::FLAG_always_opt) return; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -3827,6 +3840,7 @@ TEST(IncrementalMarkingPreservesPolymorphicIC) { |
} |
TEST(ContextDisposeDoesntClearPolymorphicIC) { |
+ if (!i::FLAG_incremental_marking) return; |
if (i::FLAG_always_opt) return; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -3982,6 +3996,7 @@ UNINITIALIZED_TEST(ReleaseStackTraceData) { |
TEST(Regress159140) { |
+ if (!i::FLAG_incremental_marking) return; |
i::FLAG_allow_natives_syntax = true; |
CcTest::InitializeVM(); |
Isolate* isolate = CcTest::i_isolate(); |
@@ -4042,6 +4057,7 @@ TEST(Regress159140) { |
TEST(Regress165495) { |
+ if (!i::FLAG_incremental_marking) return; |
i::FLAG_allow_natives_syntax = true; |
CcTest::InitializeVM(); |
Isolate* isolate = CcTest::i_isolate(); |
@@ -4088,6 +4104,7 @@ TEST(Regress165495) { |
TEST(Regress169209) { |
+ if (!i::FLAG_incremental_marking) return; |
i::FLAG_always_opt = false; |
i::FLAG_stress_compaction = false; |
i::FLAG_allow_natives_syntax = true; |
@@ -4304,6 +4321,7 @@ TEST(Regress513507) { |
TEST(Regress514122) { |
+ if (!i::FLAG_incremental_marking) return; |
i::FLAG_flush_optimized_code_cache = false; |
i::FLAG_allow_natives_syntax = true; |
CcTest::InitializeVM(); |
@@ -4565,6 +4583,7 @@ TEST(Regress513496) { |
TEST(LargeObjectSlotRecording) { |
+ if (!i::FLAG_incremental_marking) return; |
FLAG_manual_evacuation_candidates_selection = true; |
CcTest::InitializeVM(); |
Isolate* isolate = CcTest::i_isolate(); |
@@ -4637,6 +4656,7 @@ TEST(DeferredHandles) { |
TEST(IncrementalMarkingStepMakesBigProgressWithLargeObjects) { |
+ if (!FLAG_incremental_marking) return; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
CompileRun("function f(n) {" |
@@ -5448,6 +5468,7 @@ TEST(WeakCell) { |
TEST(WeakCellsWithIncrementalMarking) { |
+ if (!FLAG_incremental_marking) return; |
CcTest::InitializeVM(); |
Isolate* isolate = CcTest::i_isolate(); |
v8::internal::Heap* heap = CcTest::heap(); |
@@ -5719,6 +5740,7 @@ UNINITIALIZED_TEST(PromotionQueue) { |
TEST(Regress388880) { |
+ if (!FLAG_incremental_marking) return; |
i::FLAG_expose_gc = true; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -5766,6 +5788,7 @@ TEST(Regress388880) { |
TEST(Regress3631) { |
+ if (!FLAG_incremental_marking) return; |
i::FLAG_expose_gc = true; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -5899,6 +5922,7 @@ void CheckMapRetainingFor(int n) { |
TEST(MapRetaining) { |
+ if (!FLAG_incremental_marking) return; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
CheckMapRetainingFor(FLAG_retain_maps_for_n_gc); |
@@ -6399,6 +6423,7 @@ static UniqueId MakeUniqueId(const Persistent<T>& p) { |
TEST(Regress519319) { |
+ if (!FLAG_incremental_marking) return; |
CcTest::InitializeVM(); |
v8::Isolate* isolate = CcTest::isolate(); |
v8::HandleScope scope(isolate); |
@@ -6467,6 +6492,7 @@ HEAP_TEST(Regress587004) { |
} |
HEAP_TEST(Regress589413) { |
+ if (!FLAG_incremental_marking) return; |
FLAG_stress_compaction = true; |
FLAG_manual_evacuation_candidates_selection = true; |
FLAG_parallel_compaction = false; |
@@ -6542,6 +6568,7 @@ HEAP_TEST(Regress589413) { |
} |
TEST(Regress598319) { |
+ if (!FLAG_incremental_marking) return; |
// This test ensures that no white objects can cross the progress bar of large |
// objects during incremental marking. It checks this by using Shift() during |
// incremental marking. |
@@ -6658,6 +6685,7 @@ TEST(Regress609761) { |
} |
TEST(Regress615489) { |
+ if (!i::FLAG_incremental_marking) return; |
FLAG_black_allocation = true; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -6712,6 +6740,7 @@ class StaticOneByteResource : public v8::String::ExternalOneByteStringResource { |
}; |
TEST(Regress631969) { |
+ if (!FLAG_incremental_marking) return; |
FLAG_manual_evacuation_candidates_selection = true; |
FLAG_parallel_compaction = false; |
FLAG_concurrent_sweeping = false; |
@@ -6757,6 +6786,7 @@ TEST(Regress631969) { |
} |
TEST(LeftTrimFixedArrayInBlackArea) { |
+ if (!i::FLAG_incremental_marking) return; |
FLAG_black_allocation = true; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -6795,6 +6825,7 @@ TEST(LeftTrimFixedArrayInBlackArea) { |
} |
TEST(ContinuousLeftTrimFixedArrayInBlackArea) { |
+ if (!i::FLAG_incremental_marking) return; |
FLAG_black_allocation = true; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -6860,6 +6891,7 @@ TEST(ContinuousLeftTrimFixedArrayInBlackArea) { |
} |
TEST(ContinuousRightTrimFixedArrayInBlackArea) { |
+ if (!i::FLAG_incremental_marking) return; |
FLAG_black_allocation = true; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
@@ -6918,6 +6950,7 @@ TEST(ContinuousRightTrimFixedArrayInBlackArea) { |
} |
TEST(Regress618958) { |
+ if (!i::FLAG_incremental_marking) return; |
CcTest::InitializeVM(); |
v8::HandleScope scope(CcTest::isolate()); |
Heap* heap = CcTest::heap(); |