| Index: test/cctest/test-api.cc
|
| diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
|
| index af50d3d0eede84f7cda0810b23df8272f46293e9..fd44aec47bb2b3c05f62318fab6f38a9b94e2294 100644
|
| --- a/test/cctest/test-api.cc
|
| +++ b/test/cctest/test-api.cc
|
| @@ -431,8 +431,8 @@ THREADED_TEST(ScriptMakingExternalString) {
|
| LocalContext env;
|
| Local<String> source = String::New(two_byte_source);
|
| // Trigger GCs so that the newly allocated string moves to old gen.
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in survivor space now
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in old gen now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in survivor space now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in old gen now
|
| bool success = source->MakeExternal(new TestResource(two_byte_source));
|
| CHECK(success);
|
| Local<Script> script = Script::Compile(source);
|
| @@ -456,8 +456,8 @@ THREADED_TEST(ScriptMakingExternalAsciiString) {
|
| LocalContext env;
|
| Local<String> source = v8_str(c_source);
|
| // Trigger GCs so that the newly allocated string moves to old gen.
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in survivor space now
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in old gen now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in survivor space now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in old gen now
|
| bool success = source->MakeExternal(
|
| new TestAsciiResource(i::StrDup(c_source)));
|
| CHECK(success);
|
| @@ -479,8 +479,8 @@ TEST(MakingExternalStringConditions) {
|
| LocalContext env;
|
|
|
| // Free some space in the new space so that we can check freshness.
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE);
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE);
|
| + i::Heap::CollectGarbage(i::NEW_SPACE);
|
| + i::Heap::CollectGarbage(i::NEW_SPACE);
|
|
|
| uint16_t* two_byte_string = AsciiToTwoByteString("small");
|
| Local<String> small_string = String::New(two_byte_string);
|
| @@ -489,8 +489,8 @@ TEST(MakingExternalStringConditions) {
|
| // We should refuse to externalize newly created small string.
|
| CHECK(!small_string->CanMakeExternal());
|
| // Trigger GCs so that the newly allocated string moves to old gen.
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in survivor space now
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in old gen now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in survivor space now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in old gen now
|
| // Old space strings should be accepted.
|
| CHECK(small_string->CanMakeExternal());
|
|
|
| @@ -525,15 +525,15 @@ TEST(MakingExternalAsciiStringConditions) {
|
| LocalContext env;
|
|
|
| // Free some space in the new space so that we can check freshness.
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE);
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE);
|
| + i::Heap::CollectGarbage(i::NEW_SPACE);
|
| + i::Heap::CollectGarbage(i::NEW_SPACE);
|
|
|
| Local<String> small_string = String::New("small");
|
| // We should refuse to externalize newly created small string.
|
| CHECK(!small_string->CanMakeExternal());
|
| // Trigger GCs so that the newly allocated string moves to old gen.
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in survivor space now
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in old gen now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in survivor space now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in old gen now
|
| // Old space strings should be accepted.
|
| CHECK(small_string->CanMakeExternal());
|
|
|
| @@ -565,8 +565,8 @@ THREADED_TEST(UsingExternalString) {
|
| String::NewExternal(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.
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in survivor space now
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in old gen now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in survivor space now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in old gen now
|
| i::Handle<i::String> isymbol = i::Factory::SymbolFromString(istring);
|
| CHECK(isymbol->IsSymbol());
|
| }
|
| @@ -583,8 +583,8 @@ THREADED_TEST(UsingExternalAsciiString) {
|
| new TestAsciiResource(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.
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in survivor space now
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE); // in old gen now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in survivor space now
|
| + i::Heap::CollectGarbage(i::NEW_SPACE); // in old gen now
|
| i::Handle<i::String> isymbol = i::Factory::SymbolFromString(istring);
|
| CHECK(isymbol->IsSymbol());
|
| }
|
| @@ -602,12 +602,12 @@ THREADED_TEST(ScavengeExternalString) {
|
| Local<String> string =
|
| String::NewExternal(new TestResource(two_byte_string));
|
| i::Handle<i::String> istring = v8::Utils::OpenHandle(*string);
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE);
|
| + i::Heap::CollectGarbage(i::NEW_SPACE);
|
| in_new_space = i::Heap::InNewSpace(*istring);
|
| CHECK(in_new_space || i::Heap::old_data_space()->Contains(*istring));
|
| CHECK_EQ(0, TestResource::dispose_count);
|
| }
|
| - i::Heap::CollectGarbage(0, in_new_space ? i::NEW_SPACE : i::OLD_DATA_SPACE);
|
| + i::Heap::CollectGarbage(in_new_space ? i::NEW_SPACE : i::OLD_DATA_SPACE);
|
| CHECK_EQ(1, TestResource::dispose_count);
|
| }
|
|
|
| @@ -621,12 +621,12 @@ THREADED_TEST(ScavengeExternalAsciiString) {
|
| Local<String> string = String::NewExternal(
|
| new TestAsciiResource(i::StrDup(one_byte_string)));
|
| i::Handle<i::String> istring = v8::Utils::OpenHandle(*string);
|
| - i::Heap::CollectGarbage(0, i::NEW_SPACE);
|
| + i::Heap::CollectGarbage(i::NEW_SPACE);
|
| in_new_space = i::Heap::InNewSpace(*istring);
|
| CHECK(in_new_space || i::Heap::old_data_space()->Contains(*istring));
|
| CHECK_EQ(0, TestAsciiResource::dispose_count);
|
| }
|
| - i::Heap::CollectGarbage(0, in_new_space ? i::NEW_SPACE : i::OLD_DATA_SPACE);
|
| + i::Heap::CollectGarbage(in_new_space ? i::NEW_SPACE : i::OLD_DATA_SPACE);
|
| CHECK_EQ(1, TestAsciiResource::dispose_count);
|
| }
|
|
|
|
|