fix compilation with exceptions disabled

mmomtchev · Sep 16, 2023 · 2c4db7c · 2c4db7c
1 parent 25f3091
commit 2c4db7c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Examples/javascript/async/native_async.i b/Examples/javascript/async/native_async.i
@@ -54,7 +54,7 @@ static Napi::Value piAsync(const Napi::CallbackInfo &info) {
     virtual void Execute() override {
       Napi::Env env(nullptr);
       if (ow) ow->lock();
-#if defined(_CPPUNWIND) || defined(__EXCEPTIONS)
+#ifdef NAPI_CPP_EXCEPTIONS
       try {
         result = arg1->approx();
       } catch (const std::exception &e) {
@@ -64,9 +64,11 @@ static Napi::Value piAsync(const Napi::CallbackInfo &info) {
       result = (int)arg1->approx();
 #endif
       if (ow) ow->unlock();
+#ifndef NAPI_CPP_EXCEPTIONS
       goto fail;
     fail:
-      return;
+      returrn;
+#endif
     }
 
     virtual void Init(const Napi::CallbackInfo &info) {
@@ -97,7 +99,9 @@ static Napi::Value piAsync(const Napi::CallbackInfo &info) {
   self->Init(info);
   self->Queue();
   return self->deferred.Promise();
+#ifndef NAPI_CPP_EXCEPTIONS
 fail:
   return Napi::Value();
+#endif
 }
 %}
diff --git a/Lib/javascript/napi/javascriptcode.swg b/Lib/javascript/napi/javascriptcode.swg
@@ -934,12 +934,14 @@ fail:
       return;
     }
 
+#ifdef NAPI_CPP_EXCEPTIONS
     virtual void SWIG_NAPI_Rethrow(const std::exception_ptr &saved) override {
       // Back in the main thread with V8 access, caller has HandleScope
       $jstry
         std::rethrow_exception(saved);
       $jscatch
     }
+#endif
 
     virtual void SWIG_NAPI_Resolve() override {
       // Back in the main thread with V8 access, caller has HandleScope

diff --git a/Lib/javascript/napi/javascriptrun.swg b/Lib/javascript/napi/javascriptrun.swg
@@ -536,11 +536,14 @@ public:
   virtual void SWIG_NAPI_Execute() = 0;
   virtual void SWIG_NAPI_Resolve() = 0;
   virtual bool SWIG_NAPI_Cleanup() = 0;
+#ifdef NAPI_CPP_EXCEPTIONS
   virtual void SWIG_NAPI_Fail(const std::exception_ptr &);
   virtual void SWIG_NAPI_Rethrow(const std::exception_ptr &) = 0;
+#endif
   inline Napi::Promise SWIG_NAPI_Promise() { return SWIG_NAPI_deferred.Promise(); }
 };
 
+#ifdef NAPI_CPP_EXCEPTIONS
 void SWIG_NAPI_AsyncContext::SWIG_NAPI_Fail(const std::exception_ptr &saved) {
   Napi::Error error;
   try {
@@ -557,6 +560,7 @@ void SWIG_NAPI_AsyncContext::SWIG_NAPI_Fail(const std::exception_ptr &saved) {
 fail:
   return;
 }
+#endif
 
 // This is the async worker, this class deletes itself (NAPI does this)
 // as well as its context when the async operation completes
@@ -588,11 +592,15 @@ public:
 
   virtual void OnOK() override {
     Napi::HandleScope scope(Env());
+#ifdef NAPI_CPP_EXCEPTIONS
     if (saved_exception) {
       context->SWIG_NAPI_Fail(saved_exception);
     } else {
       context->SWIG_NAPI_Resolve();
     }
+#else
+    context->SWIG_NAPI_Resolve();
+#endif
     delete context;
   }
 
@@ -632,7 +640,7 @@ public:
   Napi::Value Run(const Napi::CallbackInfo &info) {
     SWIG_NAPI_AsyncContext::Status rc;
 
-#if defined(_CPPUNWIND) || defined(__EXCEPTIONS)
+#ifdef NAPI_CPP_EXCEPTIONS
     try {
       rc = context->SWIG_NAPI_Init(info);
     } catch (...) {