projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[runtime] Centralize the processing of MonoTrampInfo structures into the mono_tramp_i...
[mono.git]
/
mono
/
mini
/
jit-icalls.c
diff --git
a/mono/mini/jit-icalls.c
b/mono/mini/jit-icalls.c
index 10fd50a5603c4ae831a8c9a38fd1384931ee3f8b..45c7689a58ab09bf9e100b53049471ffabae6ab5 100644
(file)
--- a/
mono/mini/jit-icalls.c
+++ b/
mono/mini/jit-icalls.c
@@
-82,7
+82,7
@@
mono_helper_stelem_ref_check (MonoArray *array, MonoObject *val)
mono_raise_exception (mono_get_exception_array_type_mismatch ());
}
mono_raise_exception (mono_get_exception_array_type_mismatch ());
}
-#if
ndef MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS
+#if
!defined(MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS) || defined(MONO_ARCH_EMULATE_LONG_MUL_OVF_OPTS)
gint64
mono_llmult (gint64 a, gint64 b)
gint64
mono_llmult (gint64 a, gint64 b)
@@
-996,8
+996,7
@@
mono_helper_compile_generic_method (MonoObject *obj, MonoMethod *method, gpointe
addr = mono_compile_method (vmethod);
addr = mono_compile_method (vmethod);
- if (mono_method_needs_static_rgctx_invoke (vmethod, FALSE))
- addr = mono_create_static_rgctx_trampoline (vmethod, addr);
+ addr = mini_add_method_trampoline (NULL, vmethod, addr, mono_method_needs_static_rgctx_invoke (vmethod, FALSE), FALSE);
/* Since this is a virtual call, have to unbox vtypes */
if (obj->vtable->klass->valuetype)
/* Since this is a virtual call, have to unbox vtypes */
if (obj->vtable->klass->valuetype)