Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Varga <vargaz@gmail.com>2017-02-24 20:16:15 +0300
committerGitHub <noreply@github.com>2017-02-24 20:16:15 +0300
commit655ac68c8a2b330d96c20802642e264cbffd93b5 (patch)
tree839f41d84cc7f91a69b21789ade918be1bca7c22
parent5c11fe647563fa051f73d3571da839dfccd26f8e (diff)
[runtime] Speed up mono_icall_start()/mono_icall_end() a bit by using inline versions of the MonoError functions. (#4424)
-rw-r--r--mono/metadata/marshal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 733aa035ebf..1545e1e19ba 100644
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -12120,5 +12120,6 @@ static void
mono_icall_end (MonoThreadInfo *info, HandleStackMark *stackmark, MonoError *error)
{
mono_stack_mark_pop (info, stackmark);
- mono_error_set_pending_exception (error);
+ if (G_UNLIKELY (!is_ok (error)))
+ mono_error_set_pending_exception (error);
}