From 5175c6f68d0c38d169e6bc3277f516e345bd8b40 Mon Sep 17 00:00:00 2001 From: Joshua Date: Wed, 26 Mar 2025 18:52:48 -0700 Subject: [PATCH] Ugh. Just don't use __assume on non-msvc/clang-pretending-to-be-msvc targets. --- Common/include/Luau/Common.h | 4 ---- VM/src/lvmexecute.cpp | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Common/include/Luau/Common.h b/Common/include/Luau/Common.h index 8320621e..be741fcd 100644 --- a/Common/include/Luau/Common.h +++ b/Common/include/Luau/Common.h @@ -24,11 +24,7 @@ #define LUAU_UNLIKELY(x) __builtin_expect(x, 0) #define LUAU_UNREACHABLE() __builtin_unreachable() #define LUAU_DEBUGBREAK() __builtin_trap() -#ifdef __APPLE__ #define LUAU_ASSUME(x) (void)sizeof(!!(x)) -#else -#define LUAU_ASSUME(x) __attribute__((assume(x))); -#endif #endif // LUAU_FALLTHROUGH is a C++11-compatible alternative to [[fallthrough]] for use in the VM library diff --git a/VM/src/lvmexecute.cpp b/VM/src/lvmexecute.cpp index e6b210a6..6aecdceb 100644 --- a/VM/src/lvmexecute.cpp +++ b/VM/src/lvmexecute.cpp @@ -236,7 +236,9 @@ reentry: VM_START(); // starts the interpreter "loop" while (true) { +#if VM_USE_CGOTO dispatch: +#endif // Note: this code doesn't always execute! on some platforms we use computed goto which bypasses all of this unless we run in single-step mode // Therefore only ever put assertions here. LUAU_ASSERT(base == L->base && L->base == L->ci->base);