From: Zoltan Varga <vargaz@gmail.com>
Date: Fri, 7 Jul 2017 01:00:01 +0000 (-0400)
Subject: [arm64] Really fix handler block trampolines.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=fd5843e964bfaf313e8e7f8672bf2ebe24e9315c

[arm64] Really fix handler block trampolines.
---

diff --git a/mono/mini/tramp-arm64.c b/mono/mini/tramp-arm64.c
index dab24adaf70..be10117bbe7 100644
--- a/mono/mini/tramp-arm64.c
+++ b/mono/mini/tramp-arm64.c
@@ -546,7 +546,7 @@ mono_arch_create_handler_block_trampoline (MonoTrampInfo **info, gboolean aot)
 		code = mono_arm_emit_imm64 (code, ARMREG_IP0, (guint64)mono_arm_handler_block_trampoline_helper);
 	arm_blrx (code, ARMREG_IP0);
 	/* Set it as the return address so the trampoline will return to it */
-	arm_movx (code, ARMREG_LR, ARMREG_IP0);
+	arm_movx (code, ARMREG_LR, ARMREG_R0);
 
 	/* Call the C trampoline function */
 	if (aot) {