From 14c3548fd1229bc7577a81dff756ff6309722fff Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Wed, 18 Feb 2026 11:25:27 -0600 Subject: [PATCH] Revert "Core: Use `__fastfail()` in MSVC error macros" This reverts commit b23a233b5b0d80d287f2eeca9c7f3ec26f2558a6. --- core/error/error_macros.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/error/error_macros.h b/core/error/error_macros.h index 94d90ff7e6..e4c34a267a 100644 --- a/core/error/error_macros.h +++ b/core/error/error_macros.h @@ -32,10 +32,6 @@ #include "core/typedefs.h" -#ifdef _MSC_VER -#include // `__fastfail()`. -#endif - class String; class ObjectID; @@ -95,11 +91,11 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file, #define FUNCTION_STR __FUNCTION__ #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) /** * Don't use GENERATE_TRAP() directly, should only be used be the macros below. */ -#define GENERATE_TRAP() __fastfail(7 /* FAST_FAIL_FATAL_APP_EXIT */) +#define GENERATE_TRAP() __debugbreak() #else /** * Don't use GENERATE_TRAP() directly, should only be used be the macros below.