Skip to content

node_api: add napi_fatal_exception #19337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

node_api: add napi_fatal_exception #19337

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fefdda
n-api: test uncaught exception in worker
mafintosh Mar 14, 2018
e602e9c
n-api: fix fatalexception handling in workers
mafintosh Mar 14, 2018
a575495
n-api: add napi_fatal_exception
mafintosh Mar 14, 2018
de3c603
TBA -> REPLACEME
mafintosh Mar 14, 2018
aa5498b
add test and support passing in an error
mafintosh Mar 15, 2018
5ff7ba4
use inline fun instead of macro
mafintosh Mar 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
use inline fun instead of macro
  • Loading branch information
@mafintosh
mafintosh committed Mar 15, 2018
commit 5ff7ba41f16731313e9f1d122fd7f718e94b5cc1
18 changes: 9 additions & 9 deletions src/node_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,6 @@ struct napi_env__ {
(out) = v8::type::New((buffer), (byte_offset), (length)); \
} while (0)

#define TRIGGER_FATAL_EXCEPTION(env, local_err) \
do { \
v8::Local<v8::Message> local_msg = v8::Exception::CreateMessage( \
env->isolate, (local_err)); \
node::FatalException((env)->isolate, (local_err), local_msg); \
} while (0)


namespace {
namespace v8impl {
Expand Down Expand Up @@ -297,6 +290,13 @@ v8::Local<v8::Value> V8LocalValueFromJsValue(napi_value v) {
return local;
}

static inline void trigger_fatal_exception(
napi_env env, v8::Local<v8::Value> local_err) {
v8::Local<v8::Message> local_msg =
v8::Exception::CreateMessage(env->isolate, local_err);
node::FatalException(env->isolate, local_err, local_msg);
}

static inline napi_status V8NameFromPropertyDescriptor(napi_env env,
const napi_property_descriptor* p,
v8::Local<v8::Name>* result) {
Expand Down Expand Up @@ -967,7 +967,7 @@ napi_status napi_fatal_exception(napi_env env, napi_value err) {
CHECK_ARG(env, err);

v8::Local<v8::Value> local_err = v8impl::V8LocalValueFromJsValue(err);
TRIGGER_FATAL_EXCEPTION(env, local_err);
v8impl::trigger_fatal_exception(env, local_err);

return napi_clear_last_error(env);
}
Expand Down Expand Up @@ -3374,7 +3374,7 @@ class Work : public node::AsyncResource {
if (!env->last_exception.IsEmpty()) {
v8::Local<v8::Value> local_err = v8::Local<v8::Value>::New(
env->isolate, env->last_exception);
TRIGGER_FATAL_EXCEPTION(env, local_err);
v8impl::trigger_fatal_exception(env, local_err);
}
}
}
Expand Down