| Index: src/runtime.cc
|
| diff --git a/src/runtime.cc b/src/runtime.cc
|
| index 53b18e8e178a5c1f003301d469c74db0a5e694e5..b93f9573605d4e1faf1bc7cf647f877c28947350 100644
|
| --- a/src/runtime.cc
|
| +++ b/src/runtime.cc
|
| @@ -6047,9 +6047,11 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_GetArgumentsProperty) {
|
| HandleScope scope(isolate);
|
| if (args[0]->IsSymbol()) {
|
| // Lookup in the initial Object.prototype object.
|
| - Handle<Object> result = Object::GetProperty(
|
| - isolate->initial_object_prototype(), args.at<Symbol>(0));
|
| - RETURN_IF_EMPTY_HANDLE(isolate, result);
|
| + Handle<Object> result;
|
| + ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
|
| + isolate, result,
|
| + Object::GetProperty(
|
| + isolate->initial_object_prototype(), args.at<Symbol>(0)));
|
| return *result;
|
| }
|
|
|
| @@ -6087,9 +6089,10 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_GetArgumentsProperty) {
|
| }
|
|
|
| // Lookup in the initial Object.prototype object.
|
| - Handle<Object> result = Object::GetProperty(
|
| - isolate->initial_object_prototype(), key);
|
| - RETURN_IF_EMPTY_HANDLE(isolate, result);
|
| + Handle<Object> result;
|
| + ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
|
| + isolate, result,
|
| + Object::GetProperty(isolate->initial_object_prototype(), key));
|
| return *result;
|
| }
|
|
|
| @@ -9308,9 +9311,11 @@ static ObjectPair LoadContextSlotHelper(Arguments args,
|
|
|
| // No need to unhole the value here. This is taken care of by the
|
| // GetProperty function.
|
| - Handle<Object> value = Object::GetProperty(object, name);
|
| - RETURN_IF_EMPTY_HANDLE_VALUE(
|
| - isolate, value, MakePair(Failure::Exception(), NULL));
|
| + Handle<Object> value;
|
| + ASSIGN_RETURN_ON_EXCEPTION_VALUE(
|
| + isolate, value,
|
| + Object::GetProperty(object, name),
|
| + MakePair(Failure::Exception(), NULL));
|
| return MakePair(*value, *receiver_handle);
|
| }
|
|
|
|
|