X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-exceptions.c;h=707951af02e15c807e7eccced069307a22af527b;hb=919a03d17d36604f05e1d99c3f9f26a1509e9655;hp=10cf1b75cb194d9051761962546b5ffba8b9f8f8;hpb=f98d0799d89401853f59e4427764932d633b8935;p=mono.git

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 10cf1b75cb1..707951af02e 100644
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -1415,6 +1415,11 @@ wrap_non_exception_throws (MonoMethod *m)
 	int i;
 	gboolean val = FALSE;
 
+	if (m->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD) {
+		MonoDynamicMethod *dm = (MonoDynamicMethod *)m;
+		if (dm->assembly)
+			ass = dm->assembly;
+	}
 	g_assert (ass);
 	if (ass->wrap_non_exception_throws_inited)
 		return ass->wrap_non_exception_throws;
@@ -3263,7 +3268,7 @@ mono_llvm_load_exception (void)
 
 	if (mono_ex->trace_ips) {
 		GList *trace_ips = NULL;
-		gpointer ip = RETURN_ADDRESS ();
+		gpointer ip = MONO_RETURN_ADDRESS ();
 
 		size_t upper = mono_array_length (mono_ex->trace_ips);