From 745a6bec4a1fab5a5f56e00fc8efda84341b0634 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 6 Jul 2017 14:30:13 -0400 Subject: [PATCH] [arm] Fix the handler block trampoline, it didn't actually call the helper function. --- mono/mini/tramp-arm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mono/mini/tramp-arm.c b/mono/mini/tramp-arm.c index 13c09ac33a7..701ab31e66b 100644 --- a/mono/mini/tramp-arm.c +++ b/mono/mini/tramp-arm.c @@ -724,6 +724,7 @@ mono_arch_create_handler_block_trampoline (MonoTrampInfo **info, gboolean aot) *(gpointer*)code = mono_arm_handler_block_trampoline_helper; code += 4; } + code = emit_bx (code, ARMREG_R0); /* Set it as the return address so the trampoline will return to it */ ARM_MOV_REG_REG (code, ARMREG_LR, ARMREG_R0); -- 2.25.1