Merge pull request #3347 from lambdageek/coop-abort-ignore-unhandled

[coop] Don't call unhandled exn hook for ThreadAbortException

diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index 017a60f141c8ce4d17b441cf6513647b633638e9..9b2a401567e5823aa95dc7f96e4fecf9af70db9c 100644 (file)
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -386,6 +386,18 @@ unlock_thread (MonoInternalThread *thread)
        mono_coop_mutex_unlock (thread->synch_cs);
 }
 
+static inline gboolean
+is_appdomainunloaded_exception (MonoClass *klass)
+{
+       return klass == mono_class_get_appdomain_unloaded_exception_class ();
+}
+
+static inline gboolean
+is_threadabort_exception (MonoClass *klass)
+{
+       return klass == mono_defaults.threadabortexception_class;
+}
+
 /*
  * NOTE: this function can be called also for threads different from the current one:
  * make sure no code called from it will ever assume it is run on the thread that is
@@ -748,7 +760,11 @@ static guint32 WINAPI start_wrapper_internal(void *data)
 
                if (!mono_error_ok (&error)) {
                        MonoException *ex = mono_error_convert_to_exception (&error);
-                       if (ex) {
+
+                       g_assert (ex != NULL);
+                       MonoClass *klass = mono_object_get_class (&ex->object);
+                       if ((mono_runtime_unhandled_exception_policy_get () != MONO_UNHANDLED_POLICY_LEGACY) &&
+                           !is_threadabort_exception (klass)) {
                                mono_unhandled_exception (&ex->object);
                                mono_invoke_unhandled_exception_hook (&ex->object);
                                g_assert_not_reached ();
@@ -1112,7 +1128,7 @@ mono_thread_detach_if_exiting (void)
 }
 
 void
-mono_thread_exit ()
+mono_thread_exit (void)
 {
        MonoInternalThread *thread = mono_thread_internal_current ();
 
@@ -5050,18 +5066,6 @@ mono_thread_internal_check_for_interruption_critical (MonoInternalThread *thread
                mono_thread_interruption_checkpoint ();
 }
 
-static inline gboolean
-is_appdomainunloaded_exception (MonoClass *klass)
-{
-       return klass == mono_class_get_appdomain_unloaded_exception_class ();
-}
-
-static inline gboolean
-is_threadabort_exception (MonoClass *klass)
-{
-       return klass == mono_defaults.threadabortexception_class;
-}
-
 void
 mono_thread_internal_unhandled_exception (MonoObject* exc)
 {