[win][msvc] fix cross-compilation for arm64

StefanStojanovic · V8 LUCI CQ · commit 15e31d629ac0 · 2023-06-09T18:57:03.000Z
Cross-compiling x64 to ARM64 on Windows fails with MSVC. The reason is the ProbeMemory function which uses asm() code prohibited in this case. This change adds conditionalizing on V8_TRAP_HANDLER_SUPPORTED thus removing the problematic parts of the code in MSVC cross-compilation. This extends https://chromium-review.googlesource.com/c/v8/v8/+/3964232 in a way, as it wraps ProbeMemory usage inside of the "#ifdef V8_TRAP_HANDLER_VIA_SIMULATOR" blocks. This follows https://chromium-review.googlesource.com/c/v8/v8/+/4403215 and https://chromium-review.googlesource.com/c/v8/v8/+/4489305 as a part of an effort to completely fix cross-compilation with MSVC. Change-Id: I59d9a995fbc8ee1cee2807429fd44d8043c178fb Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4574697 Reviewed-by: Andreas Haas <ahaas@chromium.org> Reviewed-by: Mark Seaborn <mseaborn@chromium.org> Commit-Queue: Mark Seaborn <mseaborn@chromium.org> Cr-Commit-Position: refs/heads/main@{#88147}
diff --git a/src/trap-handler/trap-handler-simulator.h b/src/trap-handler/trap-handler-simulator.h
@@ -8,15 +8,12 @@
 #include <cstdint>
 
 #include "include/v8config.h"
+#include "src/trap-handler/trap-handler.h"
 
 // This header defines the ProbeMemory function to be used by simulators to
 // trigger a signal at a defined location, before doing an actual memory access.
 
-// This implementation is only usable on an x64 host with non-x64 target (i.e. a
-// simulator build on x64).
-#if (!defined(_M_X64) && !defined(__x86_64__)) || defined(V8_TARGET_ARCH_X64)
-#error "Do only include this file on simulator builds on x64."
-#endif
+#ifdef V8_TRAP_HANDLER_VIA_SIMULATOR
 
 namespace v8::internal::trap_handler {
 
@@ -40,4 +37,6 @@ uintptr_t ProbeMemory(uintptr_t address, uintptr_t pc)
 
 }  // namespace v8::internal::trap_handler
 
+#endif  // V8_TRAP_HANDLER_VIA_SIMULATOR
+
 #endif  // V8_TRAP_HANDLER_TRAP_HANDLER_SIMULATOR_H_
diff --git a/test/unittests/wasm/trap-handler-simulator-unittest.cc b/test/unittests/wasm/trap-handler-simulator-unittest.cc
@@ -13,9 +13,7 @@
 #include "test/common/assembler-tester.h"
 #include "test/unittests/test-utils.h"
 
-#if !V8_HOST_ARCH_X64 || !V8_TARGET_ARCH_ARM64
-#error "Only include this file on arm64 simulator builds on x64."
-#endif
+#ifdef V8_TRAP_HANDLER_VIA_SIMULATOR
 
 namespace v8 {
 namespace internal {
@@ -151,3 +149,5 @@ TEST_F(SimulatorTrapHandlerTest, ProbeMemoryWithLandingPad) {
 }  // namespace trap_handler
 }  // namespace internal
 }  // namespace v8
+
+#endif  // V8_TRAP_HANDLER_VIA_SIMULATOR
