| Index: test/cctest/test-heap.cc
|
| diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
|
| index 2e285916079f61528887345627c52b2d656e0168..43ab2404759e00816cfa0c0d8d228db35b6bd059 100644
|
| --- a/test/cctest/test-heap.cc
|
| +++ b/test/cctest/test-heap.cc
|
| @@ -1992,6 +1992,7 @@ TEST(InstanceOfStubWriteBarrier) {
|
|
|
| IncrementalMarking* marking = CcTest::heap()->incremental_marking();
|
| marking->Abort();
|
| + CcTest::heap()->mark_compact_collector()->ClearMarkbits();
|
| marking->Start();
|
|
|
| Handle<JSFunction> f =
|
| @@ -2114,6 +2115,7 @@ TEST(ResetSharedFunctionInfoCountersDuringIncrementalMarking) {
|
|
|
| IncrementalMarking* marking = CcTest::heap()->incremental_marking();
|
| marking->Abort();
|
| + CcTest::heap()->mark_compact_collector()->ClearMarkbits();
|
| marking->Start();
|
|
|
| // The following two calls will increment CcTest::heap()->global_ic_age().
|
| @@ -2170,6 +2172,7 @@ TEST(ResetSharedFunctionInfoCountersDuringMarkSweep) {
|
| CHECK(f->IsOptimized());
|
|
|
| CcTest::heap()->incremental_marking()->Abort();
|
| + CcTest::heap()->mark_compact_collector()->ClearMarkbits();
|
|
|
| // The following two calls will increment CcTest::heap()->global_ic_age().
|
| // Since incremental marking is off, IdleNotification will do full GC.
|
| @@ -2189,6 +2192,7 @@ TEST(IdleNotificationFinishMarking) {
|
| SimulateFullSpace(CcTest::heap()->old_pointer_space());
|
| IncrementalMarking* marking = CcTest::heap()->incremental_marking();
|
| marking->Abort();
|
| + CcTest::heap()->mark_compact_collector()->ClearMarkbits();
|
| marking->Start();
|
|
|
| CHECK_EQ(CcTest::heap()->gc_count(), 0);
|
| @@ -2234,7 +2238,6 @@ TEST(OptimizedAllocationAlwaysInNewSpace) {
|
| v8::HandleScope scope(CcTest::isolate());
|
|
|
| SimulateFullSpace(CcTest::heap()->new_space());
|
| - AlwaysAllocateScope always_allocate(CcTest::i_isolate());
|
| v8::Local<v8::Value> res = CompileRun(
|
| "function c(x) {"
|
| " this.x = x;"
|
| @@ -4601,6 +4604,7 @@ TEST(Regress388880) {
|
| // that would cause crash.
|
| IncrementalMarking* marking = CcTest::heap()->incremental_marking();
|
| marking->Abort();
|
| + CcTest::heap()->mark_compact_collector()->ClearMarkbits();
|
| marking->Start();
|
| CHECK(marking->IsMarking());
|
|
|
|
|