projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c11fe6
)
[runtime] Speed up mono_icall_start()/mono_icall_end() a bit by using inline versions...
author
Zoltan Varga
<vargaz@gmail.com>
Fri, 24 Feb 2017 17:16:15 +0000
(12:16 -0500)
committer
GitHub
<noreply@github.com>
Fri, 24 Feb 2017 17:16:15 +0000
(12:16 -0500)
mono/metadata/marshal.c
patch
|
blob
|
history
diff --git
a/mono/metadata/marshal.c
b/mono/metadata/marshal.c
index 733aa035ebf0ac3a377e2ce3b661fcf097cd0405..1545e1e19ba69a31d6f7055a8f65920a7766b950 100644
(file)
--- 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);
}