From: Zoltan Varga <vargaz@gmail.com>
Date: Tue, 25 May 2010 18:52:31 +0000 (-0000)
Subject: 2010-05-25  Zoltan Varga  <vargaz@gmail.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=46f01c3b1cc10768ef7469074ada53d2e18e9abf;p=mono.git

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 621db8bf6df..bcff2fa68cf 100755
--- 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 c67c0d0eb39..441eea21a89 100644
--- 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;