projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
d2cc9be
)
Merge pull request #3169 from lambdageek/fix-regression-70561
author
monojenkins
<jo.shields+jenkins@xamarin.com>
Wed, 15 Jun 2016 15:18:42 +0000
(16:18 +0100)
committer
GitHub
<noreply@github.com>
Wed, 15 Jun 2016 15:18:42 +0000
(16:18 +0100)
[coop] Fix regression in bug-70561.cs
Match behavior of non-coop and don't set an exit code if the main method
throws an unhandled exception.
mono/metadata/object.c
patch
|
blob
|
history
diff --git
a/mono/metadata/object.c
b/mono/metadata/object.c
index 6d67358ec0784973a90d45d3cd1a9818e1b58d97..737986052251c1385acfca6a20c6a908489ebb62 100644
(file)
--- a/
mono/metadata/object.c
+++ b/
mono/metadata/object.c
@@
-4775,13
+4775,7
@@
do_exec_main_checked (MonoMethod *method, MonoArray *args, MonoError *error)
if (is_ok (error))
rval = 0;
else {
- /* If the return type of Main is void, only
- * set the exitcode if an exception was thrown
- * (we don't want to blow away an
- * explicitly-set exit code)
- */
rval = -1;
- mono_environment_exitcode_set (rval);
}
}
return rval;