mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 17:30:27 +08:00
98fb277226
* [libffi] fix crash in debug (cherry picked from commit 78b3f05731556e23ad8f1ef8b168ad99cc1c4a9c) * Update CONTROL * [libffi] fix crash in debug (x86-windows) Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: Rolf Gebhardt <rolf.gebhardt@lbs-sw.de>
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
Rolf Gebhardt <rolf.gebhardt@lbs-sw.de>
|
|
22 Jul 2020
|
|
[PATCH] x86/win32: disable runtime stack frame checks with msvc
|
|
around built assembly
|
|
|
|
based on the patch for x86/win64:
|
|
|
|
From 53291b332b1bc061a3409d3b60c38f313609b98e Mon Sep 17 00:00:00 2001
|
|
From: Matthew Waters <matthew@centricular.com>
|
|
Date: Fri, 16 Mar 2018 15:10:04 +1100
|
|
Subject: [PATCH] x86/win64: disable runtime stack frame checks with msvc
|
|
around built assembly
|
|
|
|
MSVC can add truntime code that checks if a stack frame is mismanaged
|
|
however our custom assembly delibrately accesses and modifies the parent
|
|
stack frame. Fortunately we can disable that specific check for the
|
|
function call so do that.
|
|
---
|
|
src/x86/ffi.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/src/x86/ffi.c b/src/x86/ffi.c
|
|
index 9a59218..9f5d703 100644
|
|
--- a/src/x86/ffi.c
|
|
+++ b/src/x86/ffi.c
|
|
@@ -255,6 +255,14 @@ static const struct abi_params abi_params[FFI_LAST_ABI] = {
|
|
|
|
extern void FFI_DECLARE_FASTCALL ffi_call_i386(struct call_frame *, char *) FFI_HIDDEN;
|
|
|
|
+/* we perform some black magic here to use some of the parent's
|
|
+ * stack frame in ff_call_win() that breaks with the msvc compiler
|
|
+ * with the /RTCs or /GZ flags. Disable the 'Stack frame run time
|
|
+ * error checking' for this function so we don't hit weird exceptions
|
|
+ * in debug builds */
|
|
+#if defined(_MSC_VER)
|
|
+#pragma runtime_checks("s", off)
|
|
+#endif
|
|
static void
|
|
ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
|
|
void **avalue, void *closure)
|
|
@@ -390,6 +398,9 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
|
|
|
|
ffi_call_i386 (frame, stack);
|
|
}
|
|
+#if defined(_MSC_VER)
|
|
+#pragma runtime_checks("s", restore)
|
|
+#endif
|
|
|
|
void
|
|
ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
|