Skip to content

[mono] Fix delegate invokes to dynamic methods in mixed mode. #50547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2021
Merged

[mono] Fix delegate invokes to dynamic methods in mixed mode. #50547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/mono/mono/mini/calls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,10 +670,17 @@ mini_emit_llvmonly_virtual_call (MonoCompile *cfg, MonoMethod *cmethod, MonoMeth
int offset;
gboolean special_array_interface = m_class_is_array_special_interface (cmethod->klass);

if (cfg->interp && can_enter_interp (cfg, cmethod, TRUE))
if (cfg->interp && can_enter_interp (cfg, cmethod, TRUE)) {
/* Need wrappers for this signature to be able to enter interpreter */
cfg->interp_in_signatures = g_slist_prepend_mempool (cfg->mempool, cfg->interp_in_signatures, fsig);

if (m_class_is_delegate (cmethod->klass) && !strcmp (cmethod->name, "Invoke")) {
/* To support dynamically generated code, add a signature for the actual method called by the delegate as well. */
MonoMethodSignature *nothis_sig = mono_metadata_signature_dup_add_this (m_class_get_image (cmethod->klass), fsig, mono_get_object_class ());
cfg->interp_in_signatures = g_slist_prepend_mempool (cfg->mempool, cfg->interp_in_signatures, nothis_sig);
}
}

/*
* In llvm-only mode, vtables contain function descriptors instead of
* method addresses/trampolines.
Expand Down