Address review comments

- Move define to src - Correct fix implementation
nodejs · Apr 23, 2021 · a089697 · a089697
1 parent 5382c4a
commit a089697
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/common.gypi b/common.gypi
@@ -15,7 +15,6 @@
       }
     }]
   ],
-  'defines': [ 'NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS' ],
   'include_dirs': ["<!(node -p \"require('../').include_dir\")"],
   'cflags': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ],
   'cflags_cc': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ]

diff --git a/napi-inl.h b/napi-inl.h
@@ -2418,11 +2418,6 @@ inline void Error::ThrowAsJavaScriptException() const {
     napi_status status = napi_throw(_env, Value());
 #endif
 
-    if (status == napi_pending_exception) {
-      // The environment could be terminating.
-      return;
-    }
-
 #ifdef NAPI_CPP_EXCEPTIONS
     if (status != napi_ok) {
       throw Error::New(_env);

diff --git a/test/error.cc b/test/error.cc
@@ -1,3 +1,4 @@
+#define NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS
 #include <future>
 #include "napi.h"