| Index: src/runtime.cc
|
| diff --git a/src/runtime.cc b/src/runtime.cc
|
| index 959a04242cba1ab7689449d1c01ef1066c011e16..93b2fbd4740dea7348a3a43f847b6e818b672b53 100644
|
| --- a/src/runtime.cc
|
| +++ b/src/runtime.cc
|
| @@ -10810,18 +10810,17 @@ static MaybeObject* DebugLookupResultValue(Heap* heap,
|
| if (structure->IsForeign() || structure->IsAccessorInfo()) {
|
| Isolate* isolate = heap->isolate();
|
| HandleScope scope(isolate);
|
| - Handle<Object> value = JSObject::GetPropertyWithCallback(
|
| + MaybeHandle<Object> maybe_value = JSObject::GetPropertyWithCallback(
|
| handle(result->holder(), isolate),
|
| handle(receiver, isolate),
|
| handle(structure, isolate),
|
| handle(name, isolate));
|
| - if (value.is_null()) {
|
| - MaybeObject* exception = heap->isolate()->pending_exception();
|
| - heap->isolate()->clear_pending_exception();
|
| - if (caught_exception != NULL) *caught_exception = true;
|
| - return exception;
|
| - }
|
| - return *value;
|
| + Handle<Object> value;
|
| + if (maybe_value.ToHandle(&value)) return *value;
|
| + MaybeObject* exception = heap->isolate()->pending_exception();
|
| + heap->isolate()->clear_pending_exception();
|
| + if (caught_exception != NULL) *caught_exception = true;
|
| + return exception;
|
| } else {
|
| return heap->undefined_value();
|
| }
|
| @@ -11004,9 +11003,10 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_DebugNamedInterceptorPropertyValue) {
|
| CONVERT_ARG_HANDLE_CHECKED(Name, name, 1);
|
|
|
| PropertyAttributes attributes;
|
| - Handle<Object> result =
|
| - JSObject::GetPropertyWithInterceptor(obj, obj, name, &attributes);
|
| - RETURN_IF_EMPTY_HANDLE(isolate, result);
|
| + Handle<Object> result;
|
| + ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
|
| + isolate, result,
|
| + JSObject::GetPropertyWithInterceptor(obj, obj, name, &attributes));
|
| return *result;
|
| }
|
|
|
|
|