| Index: test/cctest/test-heap.cc
|
| diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
|
| index 1f3fa318b28f29e16264b917b54ca08b2e4cf49f..843bca88ff0a948c2f8ecac518a2e0d24626d1b8 100644
|
| --- a/test/cctest/test-heap.cc
|
| +++ b/test/cctest/test-heap.cc
|
| @@ -293,8 +293,10 @@ TEST(GarbageCollection) {
|
| JSReceiver::SetProperty(
|
| obj, prop_namex, twenty_four, NONE, SLOPPY).Check();
|
|
|
| - CHECK_EQ(Smi::FromInt(23), *Object::GetProperty(obj, prop_name));
|
| - CHECK_EQ(Smi::FromInt(24), *Object::GetProperty(obj, prop_namex));
|
| + CHECK_EQ(Smi::FromInt(23),
|
| + *Object::GetProperty(obj, prop_name).ToHandleChecked());
|
| + CHECK_EQ(Smi::FromInt(24),
|
| + *Object::GetProperty(obj, prop_namex).ToHandleChecked());
|
| }
|
|
|
| heap->CollectGarbage(NEW_SPACE);
|
| @@ -302,7 +304,8 @@ TEST(GarbageCollection) {
|
| // Function should be alive.
|
| CHECK(JSReceiver::HasLocalProperty(global, name));
|
| // Check function is retained.
|
| - Handle<Object> func_value = Object::GetProperty(global, name);
|
| + Handle<Object> func_value =
|
| + Object::GetProperty(global, name).ToHandleChecked();
|
| CHECK(func_value->IsJSFunction());
|
| Handle<JSFunction> function = Handle<JSFunction>::cast(func_value);
|
|
|
| @@ -319,9 +322,11 @@ TEST(GarbageCollection) {
|
| heap->CollectGarbage(NEW_SPACE);
|
|
|
| CHECK(JSReceiver::HasLocalProperty(global, obj_name));
|
| - Handle<Object> obj = Object::GetProperty(global, obj_name);
|
| + Handle<Object> obj =
|
| + Object::GetProperty(global, obj_name).ToHandleChecked();
|
| CHECK(obj->IsJSObject());
|
| - CHECK_EQ(Smi::FromInt(23), *Object::GetProperty(obj, prop_name));
|
| + CHECK_EQ(Smi::FromInt(23),
|
| + *Object::GetProperty(obj, prop_name).ToHandleChecked());
|
| }
|
|
|
|
|
| @@ -645,11 +650,13 @@ TEST(FunctionAllocation) {
|
| Handle<String> prop_name = factory->InternalizeUtf8String("theSlot");
|
| Handle<JSObject> obj = factory->NewJSObject(function);
|
| JSReceiver::SetProperty(obj, prop_name, twenty_three, NONE, SLOPPY).Check();
|
| - CHECK_EQ(Smi::FromInt(23), *Object::GetProperty(obj, prop_name));
|
| + CHECK_EQ(Smi::FromInt(23),
|
| + *Object::GetProperty(obj, prop_name).ToHandleChecked());
|
| // Check that we can add properties to function objects.
|
| JSReceiver::SetProperty(
|
| function, prop_name, twenty_four, NONE, SLOPPY).Check();
|
| - CHECK_EQ(Smi::FromInt(24), *Object::GetProperty(function, prop_name));
|
| + CHECK_EQ(Smi::FromInt(24),
|
| + *Object::GetProperty(function, prop_name).ToHandleChecked());
|
| }
|
|
|
|
|
| @@ -660,8 +667,8 @@ TEST(ObjectProperties) {
|
|
|
| v8::HandleScope sc(CcTest::isolate());
|
| Handle<String> object_string(String::cast(CcTest::heap()->Object_string()));
|
| - Handle<Object> object =
|
| - Object::GetProperty(CcTest::i_isolate()->global_object(), object_string);
|
| + Handle<Object> object = Object::GetProperty(
|
| + CcTest::i_isolate()->global_object(), object_string).ToHandleChecked();
|
| Handle<JSFunction> constructor = Handle<JSFunction>::cast(object);
|
| Handle<JSObject> obj = factory->NewJSObject(constructor);
|
| Handle<String> first = factory->InternalizeUtf8String("first");
|
| @@ -742,7 +749,8 @@ TEST(JSObjectMaps) {
|
| // Set a propery
|
| Handle<Smi> twenty_three(Smi::FromInt(23), isolate);
|
| JSReceiver::SetProperty(obj, prop_name, twenty_three, NONE, SLOPPY).Check();
|
| - CHECK_EQ(Smi::FromInt(23), *Object::GetProperty(obj, prop_name));
|
| + CHECK_EQ(Smi::FromInt(23),
|
| + *Object::GetProperty(obj, prop_name).ToHandleChecked());
|
|
|
| // Check the map has changed
|
| CHECK(*initial_map != obj->map());
|
| @@ -756,8 +764,8 @@ TEST(JSArray) {
|
|
|
| v8::HandleScope sc(CcTest::isolate());
|
| Handle<String> name = factory->InternalizeUtf8String("Array");
|
| - Handle<Object> fun_obj =
|
| - Object::GetProperty(CcTest::i_isolate()->global_object(), name);
|
| + Handle<Object> fun_obj = Object::GetProperty(
|
| + CcTest::i_isolate()->global_object(), name).ToHandleChecked();
|
| Handle<JSFunction> function = Handle<JSFunction>::cast(fun_obj);
|
|
|
| // Allocate the object.
|
| @@ -805,8 +813,8 @@ TEST(JSObjectCopy) {
|
|
|
| v8::HandleScope sc(CcTest::isolate());
|
| Handle<String> object_string(String::cast(CcTest::heap()->Object_string()));
|
| - Handle<Object> object =
|
| - Object::GetProperty(CcTest::i_isolate()->global_object(), object_string);
|
| + Handle<Object> object = Object::GetProperty(
|
| + CcTest::i_isolate()->global_object(), object_string).ToHandleChecked();
|
| Handle<JSFunction> constructor = Handle<JSFunction>::cast(object);
|
| Handle<JSObject> obj = factory->NewJSObject(constructor);
|
| Handle<String> first = factory->InternalizeUtf8String("first");
|
| @@ -830,10 +838,10 @@ TEST(JSObjectCopy) {
|
| CHECK_EQ(*i::Object::GetElement(isolate, obj, 1).ToHandleChecked(),
|
| *i::Object::GetElement(isolate, clone, 1).ToHandleChecked());
|
|
|
| - CHECK_EQ(*Object::GetProperty(obj, first),
|
| - *Object::GetProperty(clone, first));
|
| - CHECK_EQ(*Object::GetProperty(obj, second),
|
| - *Object::GetProperty(clone, second));
|
| + CHECK_EQ(*Object::GetProperty(obj, first).ToHandleChecked(),
|
| + *Object::GetProperty(clone, first).ToHandleChecked());
|
| + CHECK_EQ(*Object::GetProperty(obj, second).ToHandleChecked(),
|
| + *Object::GetProperty(clone, second).ToHandleChecked());
|
|
|
| // Flip the values.
|
| JSReceiver::SetProperty(clone, first, two, NONE, SLOPPY).Check();
|
| @@ -847,10 +855,10 @@ TEST(JSObjectCopy) {
|
| CHECK_EQ(*i::Object::GetElement(isolate, obj, 0).ToHandleChecked(),
|
| *i::Object::GetElement(isolate, clone, 1).ToHandleChecked());
|
|
|
| - CHECK_EQ(*Object::GetProperty(obj, second),
|
| - *Object::GetProperty(clone, first));
|
| - CHECK_EQ(*Object::GetProperty(obj, first),
|
| - *Object::GetProperty(clone, second));
|
| + CHECK_EQ(*Object::GetProperty(obj, second).ToHandleChecked(),
|
| + *Object::GetProperty(clone, first).ToHandleChecked());
|
| + CHECK_EQ(*Object::GetProperty(obj, first).ToHandleChecked(),
|
| + *Object::GetProperty(clone, second).ToHandleChecked());
|
| }
|
|
|
|
|
| @@ -1069,8 +1077,8 @@ TEST(TestCodeFlushing) {
|
| }
|
|
|
| // Check function is compiled.
|
| - Handle<Object> func_value =
|
| - Object::GetProperty(CcTest::i_isolate()->global_object(), foo_name);
|
| + Handle<Object> func_value = Object::GetProperty(
|
| + CcTest::i_isolate()->global_object(), foo_name).ToHandleChecked();
|
| CHECK(func_value->IsJSFunction());
|
| Handle<JSFunction> function = Handle<JSFunction>::cast(func_value);
|
| CHECK(function->shared()->is_compiled());
|
| @@ -1120,7 +1128,7 @@ TEST(TestCodeFlushingPreAged) {
|
|
|
| // Check function is compiled.
|
| Handle<Object> func_value =
|
| - Object::GetProperty(isolate->global_object(), foo_name);
|
| + Object::GetProperty(isolate->global_object(), foo_name).ToHandleChecked();
|
| CHECK(func_value->IsJSFunction());
|
| Handle<JSFunction> function = Handle<JSFunction>::cast(func_value);
|
| CHECK(function->shared()->is_compiled());
|
| @@ -1185,7 +1193,7 @@ TEST(TestCodeFlushingIncremental) {
|
|
|
| // Check function is compiled.
|
| Handle<Object> func_value =
|
| - Object::GetProperty(isolate->global_object(), foo_name);
|
| + Object::GetProperty(isolate->global_object(), foo_name).ToHandleChecked();
|
| CHECK(func_value->IsJSFunction());
|
| Handle<JSFunction> function = Handle<JSFunction>::cast(func_value);
|
| CHECK(function->shared()->is_compiled());
|
| @@ -1262,12 +1270,12 @@ TEST(TestCodeFlushingIncrementalScavenge) {
|
|
|
| // Check functions are compiled.
|
| Handle<Object> func_value =
|
| - Object::GetProperty(isolate->global_object(), foo_name);
|
| + Object::GetProperty(isolate->global_object(), foo_name).ToHandleChecked();
|
| CHECK(func_value->IsJSFunction());
|
| Handle<JSFunction> function = Handle<JSFunction>::cast(func_value);
|
| CHECK(function->shared()->is_compiled());
|
| Handle<Object> func_value2 =
|
| - Object::GetProperty(isolate->global_object(), bar_name);
|
| + Object::GetProperty(isolate->global_object(), bar_name).ToHandleChecked();
|
| CHECK(func_value2->IsJSFunction());
|
| Handle<JSFunction> function2 = Handle<JSFunction>::cast(func_value2);
|
| CHECK(function2->shared()->is_compiled());
|
| @@ -1324,7 +1332,7 @@ TEST(TestCodeFlushingIncrementalAbort) {
|
|
|
| // Check function is compiled.
|
| Handle<Object> func_value =
|
| - Object::GetProperty(isolate->global_object(), foo_name);
|
| + Object::GetProperty(isolate->global_object(), foo_name).ToHandleChecked();
|
| CHECK(func_value->IsJSFunction());
|
| Handle<JSFunction> function = Handle<JSFunction>::cast(func_value);
|
| CHECK(function->shared()->is_compiled());
|
|
|