From 8d7c83a27746ab2129d89fa66f8132edb79c16c8 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 18 Apr 2017 14:03:55 -0400 Subject: [PATCH] [jit] Disable handler block trampolines+aot support on ios, it does an async stack walk, and the eh info for llvm compiled methods cannot be loaded in async context currently. Works around #54658. (#4713) --- mono/mini/mini-arm.h | 2 ++ mono/mini/mini-arm64.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h index a7da8a6a98c..0e2c739889b 100644 --- a/mono/mini/mini-arm.h +++ b/mono/mini/mini-arm.h @@ -341,7 +341,9 @@ typedef struct MonoCompileArch { #define MONO_ARCH_HAVE_SETUP_ASYNC_CALLBACK 1 #define MONO_ARCH_HAVE_CONTEXT_SET_INT_REG 1 #define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD 1 +#ifndef TARGET_IOS #define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD_AOT 1 +#endif #define MONO_ARCH_HAVE_SETUP_RESUME_FROM_SIGNAL_HANDLER_CTX 1 #define MONO_ARCH_GSHAREDVT_SUPPORTED 1 #define MONO_ARCH_HAVE_GENERAL_RGCTX_LAZY_FETCH_TRAMPOLINE 1 diff --git a/mono/mini/mini-arm64.h b/mono/mini/mini-arm64.h index f6dc7946c11..8b59f02e3f0 100644 --- a/mono/mini/mini-arm64.h +++ b/mono/mini/mini-arm64.h @@ -155,7 +155,9 @@ typedef struct { #define MONO_ARCH_HAVE_OPCODE_NEEDS_EMULATION 1 #define MONO_ARCH_HAVE_DECOMPOSE_LONG_OPTS 1 #define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD 1 +#ifndef TARGET_IOS #define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD_AOT 1 +#endif #ifdef TARGET_IOS -- 2.25.1