[llvmonly] Catch all exceptions in mono_jit_exec () to avoid terminating the runtime...

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index 2bf88c38789259da84e3417fc7d62f2e1b3f60e8..963ceccb560316d30a58444f635c48f1ef8f1ede 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -1019,7 +1019,20 @@ mono_jit_exec (MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[
                return 1;
        }
        
-       return mono_runtime_run_main (method, argc, argv, NULL);
+       if (mono_llvm_only) {
+               MonoObject *exc;
+               int res;
+
+               res = mono_runtime_run_main (method, argc, argv, &exc);
+               if (exc) {
+                       mono_unhandled_exception (exc);
+                       mono_invoke_unhandled_exception_hook (exc);
+                       return 1;
+               }
+               return res;
+       } else {
+               return mono_runtime_run_main (method, argc, argv, NULL);
+       }
 }
 
 typedef struct