#include <mono/metadata/tabledefs.h>
#include <mono/utils/mono-counters.h>
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-#include <valgrind/memcheck.h>
-#endif
-
#include "mini.h"
#include "debug-mini.h"
* methods code. These trampolines are similar to the unbox trampolines, they
* perform the same task as the static rgctx wrappers, but they are smaller/faster,
* and can be made to work with full AOT.
+ * On PPC addr should be an ftnptr and the return value is an ftnptr too.
*/
gpointer
mono_create_static_rgctx_trampoline (MonoMethod *m, gpointer addr)
RgctxTrampInfo tmp_info;
RgctxTrampInfo *info;
+#ifdef PPC_USES_FUNCTION_DESCRIPTOR
+ g_assert (((gpointer*)addr) [2] == 0);
+#endif
+
if (mini_method_get_context (m)->method_inst)
ctx = mono_method_lookup_rgctx (mono_class_vtable (mono_domain_get (), m->klass), mini_method_get_context (m)->method_inst);
else
#ifdef MONO_ARCH_HAVE_IMT
static gpointer*
-mono_convert_imt_slot_to_vtable_slot (gpointer* slot, mgreg_t *regs, guint8 *code, MonoMethod *method, MonoMethod **impl_method, gboolean *need_rgctx_tramp)
+mono_convert_imt_slot_to_vtable_slot (gpointer* slot, mgreg_t *regs, guint8 *code, MonoMethod *method, MonoMethod **impl_method, gboolean *need_rgctx_tramp, gboolean *variance_used)
{
- MonoGenericSharingContext *gsctx = mono_get_generic_context_from_code (code);
- MonoObject *this_argument = mono_arch_find_this_argument (regs, method, gsctx);
+ MonoObject *this_argument = mono_arch_get_this_arg_from_call (NULL, mono_method_signature (method), regs, code);
MonoVTable *vt = this_argument->vtable;
int displacement = slot - ((gpointer*)vt);
int interface_offset;
int imt_slot = MONO_IMT_SIZE + displacement;
- interface_offset = mono_class_interface_offset (vt->klass, imt_method->klass);
+ /*This has to be variance aware since imt_method can be from an interface that vt->klass doesn't directly implement*/
+ interface_offset = mono_class_interface_offset_with_variance (vt->klass, imt_method->klass, variance_used);
if (interface_offset < 0) {
- g_print ("%s doesn't implement interface %s\n", mono_type_get_name_full (&vt->klass->byval_arg, 0), mono_type_get_name_full (&imt_method->klass->byval_arg, 0));
- g_assert_not_reached ();
+ g_error ("%s doesn't implement interface %s\n", mono_type_get_name_full (&vt->klass->byval_arg, 0), mono_type_get_name_full (&imt_method->klass->byval_arg, 0));
}
mono_vtable_build_imt_slot (vt, mono_method_get_imt_slot (imt_method));
context.method_inst = ((MonoMethodInflated*)imt_method)->context.method_inst;
impl = mono_class_inflate_generic_method (impl, &context);
} else {
- impl = mono_class_get_vtable_entry (vt->klass, interface_offset + imt_method->slot);
+ impl = mono_class_get_vtable_entry (vt->klass, interface_offset + mono_method_get_vtable_slot (imt_method));
}
if (mono_method_needs_static_rgctx_invoke (impl, FALSE))
static gpointer
common_call_trampoline (mgreg_t *regs, guint8 *code, gpointer arg, guint8* tramp, MonoVTable *vt, gpointer *vtable_slot, gboolean need_rgctx_tramp)
{
- gpointer addr;
+ gpointer addr, compiled_method;
gboolean generic_shared = FALSE;
MonoMethod *m;
MonoMethod *declaring = NULL;
- MonoMethod *generic_virtual = NULL;
+ MonoMethod *generic_virtual = NULL, *variant_iface = NULL;
int context_used;
- gboolean proxy = FALSE;
+ gboolean proxy = FALSE, variance_used = FALSE;
gpointer *orig_vtable_slot;
+ MonoJitInfo *ji = NULL;
m = arg;
#ifdef MONO_ARCH_HAVE_IMT
if (m == MONO_FAKE_IMT_METHOD) {
MonoMethod *impl_method;
- MonoGenericSharingContext *gsctx;
MonoObject *this_arg;
/* we get the interface method because mono_convert_imt_slot_to_vtable_slot ()
vtable_slot = orig_vtable_slot;
g_assert (vtable_slot);
- gsctx = mono_get_generic_context_from_code (code);
- this_arg = mono_arch_find_this_argument (regs, m, gsctx);
+ this_arg = mono_arch_get_this_arg_from_call (NULL, mono_method_signature (m), regs, code);
if (this_arg->vtable->klass == mono_defaults.transparent_proxy_class) {
/* Use the slow path for now */
proxy = TRUE;
m = mono_object_get_virtual_method (this_arg, m);
} else {
- vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, m, &impl_method, &need_rgctx_tramp);
+ vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, m, &impl_method, &need_rgctx_tramp, &variance_used);
/* mono_convert_imt_slot_to_vtable_slot () also gives us the method that is supposed
* to be called, so we compile it and go ahead as usual.
*/
if (m->is_inflated && ((MonoMethodInflated*)m)->context.method_inst) {
/* Generic virtual method */
generic_virtual = m;
- m = impl_method;
need_rgctx_tramp = TRUE;
- } else {
- m = impl_method;
+ } else if (variance_used && mono_class_has_variant_generic_params (m->klass)) {
+ variant_iface = m;
}
+ m = impl_method;
+ }
+ }
+#endif
+
+#ifdef MONO_ARCH_LLVM_SUPPORTED
+ if (!vtable_slot && code && !need_rgctx_tramp && mono_method_needs_static_rgctx_invoke (m, FALSE)) {
+ /*
+ * Call this only if the called method is shared, cause it is slow/loads a lot of
+ * data in AOT.
+ */
+ ji = mono_jit_info_table_find (mono_domain_get (), (char*)code);
+ if (ji && ji->from_llvm) {
+ /* LLVM can't pass an rgctx arg */
+ need_rgctx_tramp = TRUE;
}
}
#endif
#endif
} else {
#ifdef MONO_ARCH_HAVE_IMT
- MonoObject *this_argument = mono_arch_find_this_argument (regs, m,
- mono_get_generic_context_from_code (code));
+ MonoObject *this_argument = mono_arch_get_this_arg_from_call (NULL, mono_method_signature (m), regs, code);
vt = this_argument->vtable;
vtable_slot = orig_vtable_slot;
}
g_assert (klass);
+ g_assert (actual_method);
g_assert (actual_method->klass == klass);
if (actual_method->is_inflated)
if (!code && mono_method_needs_static_rgctx_invoke (m, FALSE))
need_rgctx_tramp = TRUE;
- addr = mono_compile_method (m);
+ addr = compiled_method = mono_compile_method (m);
g_assert (addr);
mono_debugger_trampoline_compiled (code, m, addr);
if (need_rgctx_tramp)
addr = mono_create_static_rgctx_trampoline (m, addr);
- if (generic_virtual) {
+ if (generic_virtual || variant_iface) {
+ MonoMethod *target = generic_virtual ? generic_virtual : variant_iface;
+
vtable_slot = orig_vtable_slot;
g_assert (vtable_slot);
- if (vt->klass->valuetype)
+ if (vt->klass->valuetype) /*FIXME is this required variant iface?*/
addr = get_unbox_trampoline (mono_get_generic_context_from_code (code), m, addr, need_rgctx_tramp);
mono_method_add_generic_virtual_invocation (mono_domain_get (),
vt, vtable_slot,
- generic_virtual, addr);
+ target, addr);
return addr;
}
vtable_slot = orig_vtable_slot;
if (vtable_slot) {
+ gboolean variance_used = FALSE;
if (m->klass->valuetype)
addr = get_unbox_trampoline (mono_get_generic_context_from_code (code), m, addr, need_rgctx_tramp);
g_assert (*vtable_slot);
if (!proxy && (mono_aot_is_got_entry (code, (guint8*)vtable_slot) || mono_domain_owns_vtable_slot (mono_domain_get (), vtable_slot))) {
#ifdef MONO_ARCH_HAVE_IMT
- vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, m, NULL, &need_rgctx_tramp);
+ vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, m, NULL, &need_rgctx_tramp, &variance_used);
#endif
*vtable_slot = mono_get_addr_from_ftnptr (addr);
}
if (plt_entry) {
} else {
- MonoJitInfo *ji =
- mono_jit_info_table_find (mono_domain_get (), (char*)code);
MonoJitInfo *target_ji =
- mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (addr));
+ mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (compiled_method));
+
+ if (!ji)
+ ji = mono_jit_info_table_find (mono_domain_get (), (char*)code);
if (mono_method_same_domain (ji, target_ji))
mono_arch_patch_callsite (ji->code_start, code, addr);
*/
if ((is_got_entry && (mono_domain_get () == mono_get_root_domain ())) || mono_domain_owns_vtable_slot (mono_domain_get (), vtable_slot)) {
#ifdef MONO_ARCH_HAVE_IMT
+ gboolean variance_used = FALSE;
if (!method)
method = mono_get_method (image, token, NULL);
- vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, method, NULL, &need_rgctx_tramp);
+ vtable_slot = mono_convert_imt_slot_to_vtable_slot (vtable_slot, regs, code, method, NULL, &need_rgctx_tramp, &variance_used);
#endif
*vtable_slot = addr;
}
guint8* tramp)
{
guint32 plt_info_offset = mono_aot_get_plt_info_offset (regs, code);
+ gpointer res;
- return mono_aot_plt_resolve (aot_module, plt_info_offset, code);
+ res = mono_aot_plt_resolve (aot_module, plt_info_offset, code);
+ if (!res) {
+ if (mono_loader_get_last_error ())
+ mono_raise_exception (mono_loader_error_prepare_exception (mono_loader_get_last_error ()));
+ // FIXME: Error handling (how ?)
+ g_assert (res);
+ }
+
+ return res;
}
#endif
if (!code) {
if (mono_aot_only)
- code = mono_aot_get_named_code ("generic_class_init_trampoline");
+ /* get_named_code () might return an ftnptr, but our caller expects a direct pointer */
+ code = mono_get_addr_from_ftnptr (mono_aot_get_named_code ("generic_class_init_trampoline"));
else
code = mono_arch_create_generic_class_init_trampoline ();
}
projects / mono.git / blobdiff