From 00d7c8f8ff851982c2df4d1eb3836bd57a6bad22 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@gnome.org>
Date: Sun, 10 Jun 2007 16:39:36 +0000
Subject: [PATCH] 2007-06-10  Sanghyeon Seo <sanxiyn@gmail.com>

	* mini-exceptions.c: Generate a method profile leave event during
	an exception to ensure that the profiler gets notified.

svn path=/trunk/mono/; revision=79121
---
 mono/mini/ChangeLog         | 5 +++++
 mono/mini/mini-exceptions.c | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 6339e12a139..82adaf9e911 100644
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-10  Sanghyeon Seo <sanxiyn@gmail.com>
+
+	* mini-exceptions.c: Generate a method profile leave event during
+	an exception to ensure that the profiler gets notified.
+
 2007-06-07  Zoltan Varga  <vargaz@gmail.com>
 
 	* mini-amd64.c (peephole_pass): Merge some small changes from the linear-ir 
diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 35d5a9d1ae8..022d6d4e295 100644
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -28,6 +28,7 @@
 #include <mono/metadata/exception.h>
 #include <mono/metadata/gc-internal.h>
 #include <mono/metadata/mono-debug.h>
+#include <mono/metadata/profiler.h>
 
 #include "mini.h"
 #include "trace.h"
@@ -814,6 +815,9 @@ mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gpointer origina
 					}
 				}
 			}
+			if (!test_only)
+				if (mono_profiler_get_events () && MONO_PROFILE_ENTER_LEAVE)
+					mono_profiler_method_leave (ji->method);
 		}
 
 		*ctx = new_ctx;
-- 
2.25.1