From: Zoltan Varga <vargaz@gmail.com>
Date: Wed, 27 May 2015 15:23:29 +0000 (-0400)
Subject: [llvm] Fix rethrowing exceptions on x86.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=3b588df6300008b5272f5a2ffc708f10b41003b4;p=mono.git

[llvm] Fix rethrowing exceptions on x86.
---

diff --git a/mono/mini/exceptions-x86.c b/mono/mini/exceptions-x86.c
index d7d4f72d299..b9534ae395b 100644
--- a/mono/mini/exceptions-x86.c
+++ b/mono/mini/exceptions-x86.c
@@ -745,7 +745,7 @@ mono_arch_exceptions_init (void)
 	tramp = get_throw_trampoline ("llvm_throw_exception_trampoline", FALSE, TRUE, FALSE, FALSE, FALSE, NULL, FALSE);
 	mono_register_jit_icall (tramp, "llvm_throw_exception_trampoline", NULL, TRUE);
 
-	tramp = get_throw_trampoline ("llvm_rethrow_exception_trampoline", FALSE, TRUE, FALSE, FALSE, FALSE, NULL, FALSE);
+	tramp = get_throw_trampoline ("llvm_rethrow_exception_trampoline", TRUE, TRUE, FALSE, FALSE, FALSE, NULL, FALSE);
 	mono_register_jit_icall (tramp, "llvm_rethrow_exception_trampoline", NULL, TRUE);
 
 	tramp = get_throw_trampoline ("llvm_throw_corlib_exception_trampoline", FALSE, TRUE, TRUE, FALSE, FALSE, NULL, FALSE);