3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 06:08:03 +08:00
Code Issues Projects Releases Wiki Activity

[libffi] fix crash in debug (#12498)

Browse Source 
* [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>
This commit is contained in:
Mikhail Paulyshka 2020-08-06 01:51:36 +03:00 committed by GitHub
parent 94c657dbb5
commit 98fb277226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 98 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/libffi/CONTROL
View File

@ -1,4 +1,5 @@
Source: libffi
Version: 3.3-3
Version: 3.3
Port-Version: 4
Homepage: https://github.com/libffi/libffi
Description: Portable, high level programming interface to various calling conventions

3
ports/libffi/portfile.cmake
View File

@ -6,6 +6,9 @@ vcpkg_from_github(
REF v3.3
SHA512 62798fb31ba65fa2a0e1f71dd3daca30edcf745dc562c6f8e7126e54db92572cc63f5aa36d927dd08375bb6f38a2380ebe6c5735f35990681878fc78fc9dbc83
HEAD_REF master
PATCHES
win64-disable-stackframe-check.patch
win32-disable-stackframe-check.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

50
ports/libffi/win32-disable-stackframe-check.patch Normal file
View File

@ -0,0 +1,50 @@
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)

43
ports/libffi/win64-disable-stackframe-check.patch Normal file
View File

@ -0,0 +1,43 @@
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/ffiw64.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/x86/ffiw64.c b/src/x86/ffiw64.c
index f7875252..88bb3a34 100644
--- a/src/x86/ffiw64.c
+++ b/src/x86/ffiw64.c
@@ -106,6 +106,14 @@ EFI64(ffi_prep_cif_machdep)(ffi_cif *cif)
return FFI_OK;
}
+/* we perform some black magic here to use some of the parent's
+ * stack frame in ff_call_win64() 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)
@@ -170,6 +178,9 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
ffi_call_win64 (stack, frame, closure);
}
+#if defined(_MSC_VER)
+#pragma runtime_checks("s", restore)
+#endif
void
EFI64(ffi_call)(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)