Add C++ exception handler

2 files changed, 3 insertions, 2 deletions

diff --git a/src/javascript/jsc/bindings/ZigGlobalObject.cpp b/src/javascript/jsc/bindings/ZigGlobalObject.cpp
index 0329024a4..43a106c2d 100644
--- a/src/javascript/jsc/bindings/ZigGlobalObject.cpp
+++ b/src/javascript/jsc/bindings/ZigGlobalObject.cpp
@@ -97,7 +97,7 @@ extern "C" void JSCInitialize() {
   JSC::Options::exposeInternalModuleLoader() = true;
   JSC::Options::useSharedArrayBuffer() = true;
   // JSC::Options::useAtMethod() = true;
-  // std::set_terminate([]() { Zig__GlobalObject__onCrash(); });
+  std::set_terminate([]() { Zig__GlobalObject__onCrash(); });
   WTF::initializeMainThread();
   JSC::initialize();
 }
diff --git a/src/javascript/jsc/bindings/bindings.zig b/src/javascript/jsc/bindings/bindings.zig
index f615d584a..c3e2314f5 100644
--- a/src/javascript/jsc/bindings/bindings.zig
+++ b/src/javascript/jsc/bindings/bindings.zig
@@ -431,7 +431,8 @@ pub fn NewGlobalObject(comptime Type: type) type {
             }
 
             Output.flush();
-            std.os.abort();
+            const Reporter = @import("../../../report.zig");
+            Reporter.fatal(null, "A C++ exception occurred");
         }
     };
 }