| Index: test/cctest/test-heap.cc
|
| diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
|
| index c0cc7e654285804514c05a706cf6208284929e12..517a2e27491ddd18b7b7d40ed3e53cbb758e1773 100644
|
| --- a/test/cctest/test-heap.cc
|
| +++ b/test/cctest/test-heap.cc
|
| @@ -596,17 +596,13 @@ static const char* not_so_random_string_table[] = {
|
|
|
|
|
| static void CheckInternalizedStrings(const char** strings) {
|
| + Factory* factory = CcTest::i_isolate()->factory();
|
| for (const char* string = *strings; *strings != 0; string = *strings++) {
|
| - Object* a;
|
| - MaybeObject* maybe_a = CcTest::heap()->InternalizeUtf8String(string);
|
| - // InternalizeUtf8String may return a failure if a GC is needed.
|
| - if (!maybe_a->ToObject(&a)) continue;
|
| + Handle<String> a = factory->InternalizeUtf8String(string);
|
| CHECK(a->IsInternalizedString());
|
| - Object* b;
|
| - MaybeObject* maybe_b = CcTest::heap()->InternalizeUtf8String(string);
|
| - if (!maybe_b->ToObject(&b)) continue;
|
| - CHECK_EQ(b, a);
|
| - CHECK(String::cast(b)->IsUtf8EqualTo(CStrVector(string)));
|
| + Handle<String> b = factory->InternalizeUtf8String(string);
|
| + CHECK_EQ(*b, *a);
|
| + CHECK(String::cast(*b)->IsUtf8EqualTo(CStrVector(string)));
|
| }
|
| }
|
|
|
| @@ -614,6 +610,7 @@ static void CheckInternalizedStrings(const char** strings) {
|
| TEST(StringTable) {
|
| CcTest::InitializeVM();
|
|
|
| + v8::HandleScope sc(CcTest::isolate());
|
| CheckInternalizedStrings(not_so_random_string_table);
|
| CheckInternalizedStrings(not_so_random_string_table);
|
| }
|
|
|