| Index: test/cctest/test-heap.cc
|
| diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
|
| index ff9e51a621ab7f4c634d4de79722134265c8eabf..f8757e1c0cf97899902a0df831205d00bdd15af0 100644
|
| --- a/test/cctest/test-heap.cc
|
| +++ b/test/cctest/test-heap.cc
|
| @@ -433,7 +433,7 @@ TEST(WeakGlobalHandlesScavenge) {
|
| &TestWeakGlobalHandleCallback);
|
|
|
| // Scavenge treats weak pointers as normal roots.
|
| - heap->PerformScavenge();
|
| + heap->CollectGarbage(NEW_SPACE);
|
|
|
| CHECK((*h1)->IsString());
|
| CHECK((*h2)->IsHeapNumber());
|
| @@ -518,7 +518,7 @@ TEST(DeleteWeakGlobalHandle) {
|
| &TestWeakGlobalHandleCallback);
|
|
|
| // Scanvenge does not recognize weak reference.
|
| - heap->PerformScavenge();
|
| + heap->CollectGarbage(NEW_SPACE);
|
|
|
| CHECK(!WeakPointerCleared);
|
|
|
| @@ -1436,7 +1436,7 @@ TEST(TestInternalWeakLists) {
|
|
|
| // Scavenge treats these references as strong.
|
| for (int j = 0; j < 10; j++) {
|
| - CcTest::heap()->PerformScavenge();
|
| + CcTest::heap()->CollectGarbage(NEW_SPACE);
|
| CHECK_EQ(opt ? 5 : 0, CountOptimizedUserFunctions(ctx[i]));
|
| }
|
|
|
| @@ -1448,14 +1448,14 @@ TEST(TestInternalWeakLists) {
|
| // Get rid of f3 and f5 in the same way.
|
| CompileRun("f3=null");
|
| for (int j = 0; j < 10; j++) {
|
| - CcTest::heap()->PerformScavenge();
|
| + CcTest::heap()->CollectGarbage(NEW_SPACE);
|
| CHECK_EQ(opt ? 4 : 0, CountOptimizedUserFunctions(ctx[i]));
|
| }
|
| CcTest::heap()->CollectAllGarbage(Heap::kNoGCFlags);
|
| CHECK_EQ(opt ? 3 : 0, CountOptimizedUserFunctions(ctx[i]));
|
| CompileRun("f5=null");
|
| for (int j = 0; j < 10; j++) {
|
| - CcTest::heap()->PerformScavenge();
|
| + CcTest::heap()->CollectGarbage(NEW_SPACE);
|
| CHECK_EQ(opt ? 3 : 0, CountOptimizedUserFunctions(ctx[i]));
|
| }
|
| CcTest::heap()->CollectAllGarbage(Heap::kNoGCFlags);
|
| @@ -1477,7 +1477,7 @@ TEST(TestInternalWeakLists) {
|
|
|
| // Scavenge treats these references as strong.
|
| for (int j = 0; j < 10; j++) {
|
| - CcTest::heap()->PerformScavenge();
|
| + CcTest::heap()->CollectGarbage(i::NEW_SPACE);
|
| CHECK_EQ(kNumTestContexts - i, CountNativeContexts());
|
| }
|
|
|
|
|