[release/8.0] [mono] Extend mono_gsharedvt_constrained_call JIT icall to handle stati...

* Extend mono_gsharedvt_constrained_call JIT icall to handle static virtual methods

* Handle static virtual calls in constrained_gsharedvt_call_setup

* Fix lint

* Add runtime test

* Remove runtime test

---------

Co-authored-by: Milos Kotlar <kotlarmilos@gmail.com>

diff --git a/src/mono/mono/mini/jit-icalls.c b/src/mono/mono/mini/jit-icalls.c
index 04a15e9..628d18a 100644 (file)
--- a/src/mono/mono/mini/jit-icalls.c
+++ b/src/mono/mono/mini/jit-icalls.c
@@ -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);
@@ -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.
                 */