From bb59cee854137b8ff1b33638ef4b543d4e6a2232 Mon Sep 17 00:00:00 2001 From: Ali Hassan Date: Mon, 15 Apr 2024 23:46:34 +0500 Subject: [PATCH] src: remove misplaced windows code under posix guard in node.cc The V8 WebAssembly trap handler setup for Windows was incorrectly nested within a POSIX conditional compilation block in src/node.cc. This caused the related functions to be effectively non-operational on Windows. The changes involve removing the Windows-specific code from the POSIX section and correctly placing it under the WIN32 check. This fix will ensure that the intended exception handling is active on Windows builds. Fixes: https://github.com/nodejs/node/issues/52404 Refs: https://github.com/nodejs/node/pull/35033 --- src/node.cc | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/node.cc b/src/node.cc index 2395f28c7b8cb7..bd19cb28e400ff 100644 --- a/src/node.cc +++ b/src/node.cc @@ -635,17 +635,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) { RegisterSignalHandler(SIGTERM, SignalExit, true); #if NODE_USE_V8_WASM_TRAP_HANDLER -#if defined(_WIN32) - { - constexpr ULONG first = TRUE; - per_process::old_vectored_exception_handler = - AddVectoredExceptionHandler(first, TrapWebAssemblyOrContinue); - } -#else - // Tell V8 to disable emitting WebAssembly - // memory bounds checks. This means that we have - // to catch the SIGSEGV/SIGBUS in TrapWebAssemblyOrContinue - // and pass the signal context to V8. { struct sigaction sa; memset(&sa, 0, sizeof(sa)); @@ -657,7 +646,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) { CHECK_EQ(sigaction(SIGBUS, &sa, nullptr), 0); #endif } -#endif // defined(_WIN32) V8::EnableWebAssemblyTrapHandler(false); #endif // NODE_USE_V8_WASM_TRAP_HANDLER } @@ -686,6 +674,11 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) { } #endif // __POSIX__ #ifdef _WIN32 +{ + constexpr ULONG first = TRUE; + per_process::old_vectored_exception_handler = + AddVectoredExceptionHandler(first, TrapWebAssemblyOrContinue); +} if (!(flags & ProcessInitializationFlags::kNoStdioInitialization)) { for (int fd = 0; fd <= 2; ++fd) { auto handle = reinterpret_cast(_get_osfhandle(fd));