| Index: src/messages.cc
|
| diff --git a/src/messages.cc b/src/messages.cc
|
| index 0136b45c4bd45b18f73d62b3ad605cb1fd618c52..ba74318464cd5c8b8e5148028b43b4fe35addeb9 100644
|
| --- a/src/messages.cc
|
| +++ b/src/messages.cc
|
| @@ -161,15 +161,10 @@ Handle<String> MessageHandler::GetMessage(Isolate* isolate,
|
| Handle<Object> argv[] = { Handle<Object>(message->type(), isolate),
|
| Handle<Object>(message->arguments(), isolate) };
|
|
|
| - bool caught_exception;
|
| - Handle<Object> result =
|
| - Execution::TryCall(fun,
|
| - isolate->js_builtins_object(),
|
| - ARRAY_SIZE(argv),
|
| - argv,
|
| - &caught_exception);
|
| -
|
| - if (caught_exception || !result->IsString()) {
|
| + MaybeHandle<Object> maybe_result = Execution::TryCall(
|
| + fun, isolate->js_builtins_object(), ARRAY_SIZE(argv), argv);
|
| + Handle<Object> result;
|
| + if (!maybe_result.ToHandle(&result) || !result->IsString()) {
|
| return factory->InternalizeOneByteString(STATIC_ASCII_VECTOR("<error>"));
|
| }
|
| Handle<String> result_string = Handle<String>::cast(result);
|
|
|