Commit ed741ec
n-api: remove napi_env::CallIntoModuleThrow
Give `napi_env::CallIntoModule` the thrower used by
`CallIntoModuleThrow` as its default second argument. That way we do
not need two different methods on `napi_env` for calling into the
addon.
PR-URL: #33570
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>1 parent 41d8796 commit ed741ec
3 files changed
Lines changed: 13 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -267,7 +267,7 @@ class RefBase : protected Finalizer, RefTracker { | |||
| 267 | 267 | protected: | |
| 268 | 268 | inline void Finalize(bool is_env_teardown = false) override { | |
| 269 | 269 | if (_finalize_callback != nullptr) { | |
| 270 | - _env->CallIntoModuleThrow([&](napi_env env) { | ||
| 270 | + _env->CallIntoModule([&](napi_env env) { | ||
| 271 | 271 | _finalize_callback( | |
| 272 | 272 | env, | |
| 273 | 273 | _finalize_data, | |
@@ -508,7 +508,7 @@ class CallbackWrapperBase : public CallbackWrapper { | |||
| 508 | 508 | napi_callback cb = _bundle->*FunctionField; | |
| 509 | 509 | ||
| 510 | 510 | napi_value result; | |
| 511 | - env->CallIntoModuleThrow([&](napi_env env) { | ||
| 511 | + env->CallIntoModule([&](napi_env env) { | ||
| 512 | 512 | result = cb(env, cbinfo_wrapper); | |
| 513 | 513 | }); | |
| 514 | 514 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -82,8 +82,13 @@ struct napi_env__ { | |||
| 82 | 82 | return v8::Just(true); | |
| 83 | 83 | } | |
| 84 | 84 | ||
| 85 | - template <typename T, typename U> | ||
| 86 | - void CallIntoModule(T&& call, U&& handle_exception) { | ||
| 85 | + static inline void | ||
| 86 | + HandleThrow(napi_env env, v8::Local<v8::Value> value) { | ||
| 87 | + env->isolate->ThrowException(value); | ||
| 88 | + } | ||
| 89 | + | ||
| 90 | + template <typename T, typename U = decltype(HandleThrow)> | ||
| 91 | + inline void CallIntoModule(T&& call, U&& handle_exception = HandleThrow) { | ||
| 87 | 92 | int open_handle_scopes_before = open_handle_scopes; | |
| 88 | 93 | int open_callback_scopes_before = open_callback_scopes; | |
| 89 | 94 | napi_clear_last_error(this); | |
@@ -96,13 +101,6 @@ struct napi_env__ { | |||
| 96 | 101 | } | |
| 97 | 102 | } | |
| 98 | 103 | ||
| 99 | - template <typename T> | ||
| 100 | - void CallIntoModuleThrow(T&& call) { | ||
| 101 | - CallIntoModule(call, [&](napi_env env, v8::Local<v8::Value> value) { | ||
| 102 | - env->isolate->ThrowException(value); | ||
| 103 | - }); | ||
| 104 | - } | ||
| 105 | - | ||
| 106 | 104 | v8impl::Persistent<v8::Value> last_exception; | |
| 107 | 105 | ||
| 108 | 106 | // We store references in two different lists, depending on whether they have | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -57,7 +57,7 @@ class BufferFinalizer : private Finalizer { | |||
| 57 | 57 | v8::HandleScope handle_scope(finalizer->_env->isolate); | |
| 58 | 58 | v8::Context::Scope context_scope(finalizer->_env->context()); | |
| 59 | 59 | ||
| 60 | - finalizer->_env->CallIntoModuleThrow([&](napi_env env) { | ||
| 60 | + finalizer->_env->CallIntoModule([&](napi_env env) { | ||
| 61 | 61 | finalizer->_finalize_callback( | |
| 62 | 62 | env, | |
| 63 | 63 | finalizer->_finalize_data, | |
@@ -308,7 +308,7 @@ class ThreadSafeFunction : public node::AsyncResource { | |||
| 308 | 308 | v8::Local<v8::Function>::New(env->isolate, ref); | |
| 309 | 309 | js_callback = v8impl::JsValueFromV8LocalValue(js_cb); | |
| 310 | 310 | } | |
| 311 | - env->CallIntoModuleThrow([&](napi_env env) { | ||
| 311 | + env->CallIntoModule([&](napi_env env) { | ||
| 312 | 312 | call_js_cb(env, js_callback, context, data); | |
| 313 | 313 | }); | |
| 314 | 314 | } | |
@@ -318,7 +318,7 @@ class ThreadSafeFunction : public node::AsyncResource { | |||
| 318 | 318 | v8::HandleScope scope(env->isolate); | |
| 319 | 319 | if (finalize_cb) { | |
| 320 | 320 | CallbackScope cb_scope(this); | |
| 321 | - env->CallIntoModuleThrow([&](napi_env env) { | ||
| 321 | + env->CallIntoModule([&](napi_env env) { | ||
| 322 | 322 | finalize_cb(env, finalize_data, context); | |
| 323 | 323 | }); | |
| 324 | 324 | } | |
@@ -455,7 +455,7 @@ void napi_module_register_by_symbol(v8::Local<v8::Object> exports, | |||
| 455 | 455 | napi_env env = v8impl::NewEnv(context); | |
| 456 | 456 | ||
| 457 | 457 | napi_value _exports; | |
| 458 | - env->CallIntoModuleThrow([&](napi_env env) { | ||
| 458 | + env->CallIntoModule([&](napi_env env) { | ||
| 459 | 459 | _exports = init(env, v8impl::JsValueFromV8LocalValue(exports)); | |
| 460 | 460 | }); | |
| 461 | 461 | ||
0 commit comments