2010-05-25 Zoltan Varga <vargaz@gmail.com>

	* exceptions-amd64.c (mono_arch_find_jit_info_ext): Adjust the ip for LMF frames too.

svn path=/trunk/mono/; revision=157892

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 621db8bf6dfd990f1bd15972a9132727f8d95483..bcff2fa68cf98d6dd2f4e08c7febdc8c3111541b 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-25  Zoltan Varga  <vargaz@gmail.com>
 
+       * exceptions-amd64.c (mono_arch_find_jit_info_ext): Adjust the ip for LMF frames too.
+
        * mini-llvm.c aot-compiler.c: More LLVM 2.8 updates.
 
        * mini.h (LLVM_CHECK_VERSION): New helper macro.

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index c67c0d0eb39d805af8780f9b5d7da00b7b1bbd36..441eea21a8974f4791c2a420f015f2fbbd095c05 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -627,6 +627,9 @@ mono_arch_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls,
                        return FALSE;
                }
 
+               /* Adjust IP */
+               rip --;
+
                frame->ji = ji;
                frame->type = FRAME_TYPE_MANAGED_TO_NATIVE;