Skip to content
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

[release/8.0] [mono] Extend mono_gsharedvt_constrained_call JIT icall to handle static virtual methods #91059

Merged
merged 5 commits into from
Aug 29, 2023
Merged

[release/8.0] [mono] Extend mono_gsharedvt_constrained_call JIT icall to handle static virtual methods #91059

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea39934
Extend mono_gsharedvt_constrained_call JIT icall to handle static vir…
kotlarmilos Aug 21, 2023
17aa96e
Handle static virtual calls in constrained_gsharedvt_call_setup
kotlarmilos Aug 22, 2023
b533d36
Fix lint
kotlarmilos Aug 22, 2023
c7ba6ea
Add runtime test
kotlarmilos Aug 22, 2023
e7a186c
Remove runtime test
kotlarmilos Aug 23, 2023
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: 7 additions & 2 deletions src/mono/mono/mini/jit-icalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@ constrained_gsharedvt_call_setup (gpointer mp, MonoMethod *cmethod, MonoClass *k

error_init (error);

if (mono_class_is_interface (klass) || !m_class_is_valuetype (klass)) {
if ((mono_class_is_interface (klass) || !m_class_is_valuetype (klass)) && !m_method_is_static (cmethod)) {
MonoObject *this_obj;

is_iface = mono_class_is_interface (klass);
Expand Down Expand Up @@ -1390,7 +1390,12 @@ constrained_gsharedvt_call_setup (gpointer mp, MonoMethod *cmethod, MonoClass *k
}
}

if (m_class_is_valuetype (klass) && (m->klass == mono_defaults.object_class || m->klass == m_class_get_parent (mono_defaults.enum_class) || m->klass == mono_defaults.enum_class)) {
if (m_method_is_static (cmethod)) {
/*
* Static calls don't have this arg
*/
*this_arg = NULL;
} else if (m_class_is_valuetype (klass) && (m->klass == mono_defaults.object_class || m->klass == m_class_get_parent (mono_defaults.enum_class) || m->klass == mono_defaults.enum_class)) {
/*
* Calling a non-vtype method with a vtype receiver, has to box.
*/
Expand Down