From 655ac68c8a2b330d96c20802642e264cbffd93b5 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 24 Feb 2017 12:16:15 -0500 Subject: [PATCH] [runtime] Speed up mono_icall_start()/mono_icall_end() a bit by using inline versions of the MonoError functions. (#4424) --- mono/metadata/marshal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } -- 2.25.1