From: Aleksey Kliger (λgeek) <akliger@gmail.com>
Date: Mon, 13 Jun 2016 15:52:35 +0000 (-0400)
Subject: Merge pull request #3106 from lambdageek/dev/monoerror-unhandled
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=c6f75c367aba6c14fb86861853ca6009978c0f9b;hp=b5dc9a4951bd35b61b29faa4df93bca3c31bfa3e;p=mono.git

Merge pull request #3106 from lambdageek/dev/monoerror-unhandled

[runtime] Okay to raise MonoError in thread start functions.
---

diff --git a/mono/metadata/coree.c b/mono/metadata/coree.c
index 8c18b942780..4436229376e 100644
--- a/mono/metadata/coree.c
+++ b/mono/metadata/coree.c
@@ -199,7 +199,7 @@ __int32 STDMETHODCALLTYPE _CorExeMain(void)
 	LocalFree (argvw);
 
 	mono_runtime_run_main_checked (method, argc, argv, &error);
-	mono_error_raise_exception (&error); /* FIXME don't raise here */
+	mono_error_raise_exception (&error); /* OK, triggers unhandled exn handler */
 	mono_thread_manage ();
 
 	mono_runtime_quit ();
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index 4aa7c5d6435..0c518966310 100644
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -744,7 +744,7 @@ static guint32 WINAPI start_wrapper_internal(void *data)
 		args [0] = start_arg;
 		/* we may want to handle the exception here. See comment below on unhandled exceptions */
 		mono_runtime_delegate_invoke_checked (start_delegate, args, &error);
-		mono_error_raise_exception (&error); /* FIXME don't raise here */
+		mono_error_raise_exception (&error); /* OK, triggers unhandled exn handler */
 	}
 
 	/* If the thread calls ExitThread at all, this remaining code
diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index 18639e9de08..518834de3b4 100644
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -1038,7 +1038,7 @@ mono_jit_exec (MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[
 		return res;
 	} else {
 		int res = mono_runtime_run_main_checked (method, argc, argv, &error);
-		mono_error_raise_exception (&error); /* FIXME don't raise here */
+		mono_error_raise_exception (&error); /* OK, triggers unhandled exn handler */
 		return res;
 	}
 }