diff options
author | Gus Caplan <me@gus.host> | 2018-11-30 08:13:45 -0600 |
---|---|---|
committer | Gus Caplan <me@gus.host> | 2018-12-03 10:25:06 -0600 |
commit | f084e06de7b03750a80925a7aa1aefe3aed47504 (patch) | |
tree | a014956efe76cd2c1273811eb5efd4d30f784b94 /src/async_wrap.cc | |
parent | dbdc9081fa723f62126ef857ee9365425e41dd9f (diff) | |
download | android-node-v8-f084e06de7b03750a80925a7aa1aefe3aed47504.tar.gz android-node-v8-f084e06de7b03750a80925a7aa1aefe3aed47504.tar.bz2 android-node-v8-f084e06de7b03750a80925a7aa1aefe3aed47504.zip |
src: use custom TryCatch subclass
PR-URL: https://github.com/nodejs/node/pull/24751
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Diffstat (limited to 'src/async_wrap.cc')
-rw-r--r-- | src/async_wrap.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/async_wrap.cc b/src/async_wrap.cc index 6a354c0aec..2c9aa3cb88 100644 --- a/src/async_wrap.cc +++ b/src/async_wrap.cc @@ -58,6 +58,7 @@ using v8::WeakCallbackInfo; using v8::WeakCallbackType; using AsyncHooks = node::Environment::AsyncHooks; +using TryCatchScope = node::errors::TryCatchScope; namespace node { @@ -91,7 +92,7 @@ struct AsyncWrapObject : public AsyncWrap { static void DestroyAsyncIdsCallback(Environment* env, void* data) { Local<Function> fn = env->async_hooks_destroy_function(); - FatalTryCatch try_catch(env); + TryCatchScope try_catch(env, TryCatchScope::CatchMode::kFatal); do { std::vector<double> destroy_async_id_list; @@ -127,7 +128,7 @@ void Emit(Environment* env, double async_id, AsyncHooks::Fields type, HandleScope handle_scope(env->isolate()); Local<Value> async_id_value = Number::New(env->isolate(), async_id); - FatalTryCatch try_catch(env); + TryCatchScope try_catch(env, TryCatchScope::CatchMode::kFatal); USE(fn->Call(env->context(), Undefined(env->isolate()), 1, &async_id_value)); } @@ -673,7 +674,7 @@ void AsyncWrap::EmitAsyncInit(Environment* env, object, }; - FatalTryCatch try_catch(env); + TryCatchScope try_catch(env, TryCatchScope::CatchMode::kFatal); USE(init_fn->Call(env->context(), object, arraysize(argv), argv)); } @@ -776,7 +777,7 @@ Local<Object> AsyncWrap::GetOwner(Environment* env, Local<Object> obj) { EscapableHandleScope handle_scope(env->isolate()); CHECK(!obj.IsEmpty()); - TryCatch ignore_exceptions(env->isolate()); + TryCatchScope ignore_exceptions(env); while (true) { Local<Value> owner; if (!obj->Get(env->context(), |