Index: test/cctest/test-api.cc |
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc |
index 9a849ec4cccc1395a07ff9af723e702c5b115662..76f3304317ca2050c90ed58fed8471344358b7ac 100644 |
--- a/test/cctest/test-api.cc |
+++ b/test/cctest/test-api.cc |
@@ -462,8 +462,8 @@ |
Local<String> source = |
String::NewFromTwoByte(env->GetIsolate(), two_byte_source); |
// Trigger GCs so that the newly allocated string moves to old gen. |
- CcTest::heap()->CollectGarbageNewSpace(); // in survivor space now |
- CcTest::heap()->CollectGarbageNewSpace(); // in old gen now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in survivor space now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in old gen now |
CHECK_EQ(source->IsExternal(), false); |
CHECK_EQ(source->IsExternalOneByte(), false); |
String::Encoding encoding = String::UNKNOWN_ENCODING; |
@@ -493,8 +493,8 @@ |
v8::HandleScope scope(env->GetIsolate()); |
Local<String> source = v8_str(c_source); |
// Trigger GCs so that the newly allocated string moves to old gen. |
- CcTest::heap()->CollectGarbageNewSpace(); // in survivor space now |
- CcTest::heap()->CollectGarbageNewSpace(); // in old gen now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in survivor space now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in old gen now |
bool success = source->MakeExternal( |
new TestOneByteResource(i::StrDup(c_source), &dispose_count)); |
CHECK(success); |
@@ -516,8 +516,8 @@ |
v8::HandleScope scope(env->GetIsolate()); |
// Free some space in the new space so that we can check freshness. |
- CcTest::heap()->CollectGarbageNewSpace(); |
- CcTest::heap()->CollectGarbageNewSpace(); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
uint16_t* two_byte_string = AsciiToTwoByteString("s1"); |
Local<String> small_string = |
@@ -556,8 +556,8 @@ |
v8::HandleScope scope(env->GetIsolate()); |
// Free some space in the new space so that we can check freshness. |
- CcTest::heap()->CollectGarbageNewSpace(); |
- CcTest::heap()->CollectGarbageNewSpace(); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
Local<String> small_string = String::NewFromUtf8(env->GetIsolate(), "s1"); |
// We should refuse to externalize small strings. |
@@ -594,8 +594,8 @@ |
// Trigger GCs so that the newly allocated string moves to old gen. |
SimulateFullSpace(CcTest::heap()->old_space()); |
- CcTest::heap()->CollectGarbageNewSpace(); // in survivor space now |
- CcTest::heap()->CollectGarbageNewSpace(); // in old gen now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in survivor space now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in old gen now |
// Turn into external string with unaligned resource data. |
const char* c_cons = "_abcdefghijklmnopqrstuvwxyz"; |
@@ -609,8 +609,7 @@ |
// Trigger GCs and force evacuation. |
CcTest::heap()->CollectAllGarbage(); |
- CcTest::heap()->CollectAllGarbage("MakingExternalUnalignedOneByteString", |
- i::Heap::kReduceMemoryFootprintMask); |
+ CcTest::heap()->CollectAllGarbage(i::Heap::kReduceMemoryFootprintMask); |
} |
@@ -623,8 +622,8 @@ |
CcTest::isolate(), new TestResource(two_byte_string)); |
i::Handle<i::String> istring = v8::Utils::OpenHandle(*string); |
// Trigger GCs so that the newly allocated string moves to old gen. |
- CcTest::heap()->CollectGarbageNewSpace(); // in survivor space now |
- CcTest::heap()->CollectGarbageNewSpace(); // in old gen now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in survivor space now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in old gen now |
i::Handle<i::String> isymbol = |
factory->InternalizeString(istring); |
CHECK(isymbol->IsInternalizedString()); |
@@ -643,8 +642,8 @@ |
CcTest::isolate(), new TestOneByteResource(i::StrDup(one_byte_string))); |
i::Handle<i::String> istring = v8::Utils::OpenHandle(*string); |
// Trigger GCs so that the newly allocated string moves to old gen. |
- CcTest::heap()->CollectGarbageNewSpace(); // in survivor space now |
- CcTest::heap()->CollectGarbageNewSpace(); // in old gen now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in survivor space now |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); // in old gen now |
i::Handle<i::String> isymbol = |
factory->InternalizeString(istring); |
CHECK(isymbol->IsInternalizedString()); |
@@ -712,7 +711,7 @@ |
Local<String> string = String::NewExternal( |
CcTest::isolate(), new TestResource(two_byte_string, &dispose_count)); |
i::Handle<i::String> istring = v8::Utils::OpenHandle(*string); |
- CcTest::heap()->CollectGarbageNewSpace(); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
in_new_space = CcTest::heap()->InNewSpace(*istring); |
CHECK(in_new_space || CcTest::heap()->old_space()->Contains(*istring)); |
CHECK_EQ(0, dispose_count); |
@@ -734,7 +733,7 @@ |
CcTest::isolate(), |
new TestOneByteResource(i::StrDup(one_byte_string), &dispose_count)); |
i::Handle<i::String> istring = v8::Utils::OpenHandle(*string); |
- CcTest::heap()->CollectGarbageNewSpace(); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
in_new_space = CcTest::heap()->InNewSpace(*istring); |
CHECK(in_new_space || CcTest::heap()->old_space()->Contains(*istring)); |
CHECK_EQ(0, dispose_count); |
@@ -3391,7 +3390,7 @@ |
CHECK_EQ(initial_handle_count + 1, global_handles->global_handles_count()); |
if (map.IsWeak()) { |
CcTest::i_isolate()->heap()->CollectAllGarbage( |
- "TestGlobalValueMap", i::Heap::kAbortIncrementalMarkingMask); |
+ i::Heap::kAbortIncrementalMarkingMask); |
} else { |
map.Clear(); |
} |
@@ -6544,7 +6543,7 @@ |
if (global_gc) { |
CcTest::heap()->CollectAllGarbage(); |
} else { |
- CcTest::heap()->CollectGarbageNewSpace(); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
} |
// We are relying on this creating a big flag array and reserving the space |
// up front. |
@@ -6662,7 +6661,7 @@ |
if (global_gc) { |
CcTest::heap()->CollectAllGarbage(); |
} else { |
- CcTest::heap()->CollectGarbageNewSpace(); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
} |
CHECK_EQ(1729, t1->x()); |
@@ -6707,10 +6706,9 @@ |
object_a.handle.Reset(iso, a); |
object_b.handle.Reset(iso, b); |
if (global_gc) { |
- CcTest::heap()->CollectAllGarbage("ResetWeakHandle", |
- Heap::kAbortIncrementalMarkingMask); |
+ CcTest::heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask); |
} else { |
- CcTest::heap()->CollectGarbageNewSpace(); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
} |
} |
@@ -6726,8 +6724,7 @@ |
CHECK(object_b.handle.IsIndependent()); |
} |
if (global_gc) { |
- CcTest::heap()->CollectAllGarbage("ResetWeakHandle", |
- Heap::kAbortIncrementalMarkingMask); |
+ CcTest::heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask); |
} else { |
CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
} |
@@ -6742,7 +6739,7 @@ |
} |
-static void InvokeScavenge() { CcTest::heap()->CollectGarbageNewSpace(); } |
+static void InvokeScavenge() { CcTest::heap()->CollectGarbage(i::NEW_SPACE); } |
static void InvokeMarkSweep() { CcTest::heap()->CollectAllGarbage(); } |
@@ -11715,8 +11712,7 @@ |
// been marked at that point. Therefore some of the maps are not |
// collected until the second garbage collection. |
CcTest::heap()->CollectAllGarbage(); |
- CcTest::heap()->CollectAllGarbage("CheckSurvivingGlobalObjectsCount", |
- i::Heap::kMakeHeapIterableMask); |
+ CcTest::heap()->CollectAllGarbage(i::Heap::kMakeHeapIterableMask); |
int count = GetGlobalObjectsCount(); |
#ifdef DEBUG |
if (count != expected) CcTest::heap()->TracePathToGlobal(); |
@@ -11815,7 +11811,7 @@ |
handle, WeakApiCallback, v8::WeakCallbackType::kParameter); |
} |
reinterpret_cast<i::Isolate*>(isolate)->heap()->CollectAllGarbage( |
- "WeakCallbackApi", i::Heap::kAbortIncrementalMarkingMask); |
+ i::Heap::kAbortIncrementalMarkingMask); |
// Verify disposed. |
CHECK_EQ(initial_handles, globals->global_handles_count()); |
} |
@@ -15450,7 +15446,7 @@ |
TEST(Regress2333) { |
LocalContext env; |
for (int i = 0; i < 3; i++) { |
- CcTest::heap()->CollectGarbageNewSpace(); |
+ CcTest::heap()->CollectGarbage(i::NEW_SPACE); |
} |
} |
@@ -16463,8 +16459,8 @@ |
Local<Object> obj = Object::New(isolate); |
CHECK(!obj.IsEmpty()); |
- CcTest::heap()->CollectAllGarbage("PrologueCallbackAlloc", |
- i::Heap::kAbortIncrementalMarkingMask); |
+ CcTest::heap()->CollectAllGarbage( |
+ i::Heap::kAbortIncrementalMarkingMask); |
} |
@@ -16483,8 +16479,8 @@ |
Local<Object> obj = Object::New(isolate); |
CHECK(!obj.IsEmpty()); |
- CcTest::heap()->CollectAllGarbage("EpilogueCallbackAlloc", |
- i::Heap::kAbortIncrementalMarkingMask); |
+ CcTest::heap()->CollectAllGarbage( |
+ i::Heap::kAbortIncrementalMarkingMask); |
} |
@@ -16559,8 +16555,8 @@ |
CHECK_EQ(0, epilogue_call_count_alloc); |
isolate->AddGCPrologueCallback(PrologueCallbackAlloc); |
isolate->AddGCEpilogueCallback(EpilogueCallbackAlloc); |
- CcTest::heap()->CollectAllGarbage("GCCallbacks", |
- i::Heap::kAbortIncrementalMarkingMask); |
+ CcTest::heap()->CollectAllGarbage( |
+ i::Heap::kAbortIncrementalMarkingMask); |
CHECK_EQ(1, prologue_call_count_alloc); |
CHECK_EQ(1, epilogue_call_count_alloc); |
isolate->RemoveGCPrologueCallback(PrologueCallbackAlloc); |