2009-12-04 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / jit-icalls.c

diff --git a/mono/mini/jit-icalls.c b/mono/mini/jit-icalls.c
index 49aaa866546e29966d06cc80286967a322341545..6accfcbe0fde6b25e80483a106b8e57e4bde9fb5 100644 (file)
--- a/mono/mini/jit-icalls.c
+++ b/mono/mini/jit-icalls.c
@@ -52,8 +52,7 @@ ldvirtfn_internal (MonoObject *obj, MonoMethod *method, gboolean gshared)
                res = mono_class_inflate_generic_method (res, &context);
        }
 
-       if (mono_method_needs_static_rgctx_invoke (res, FALSE))
-               res = mono_marshal_get_static_rgctx_invoke (res);
+       /* An rgctx wrapper is added by the trampolines no need to do it here */
 
        return mono_ldftn (res);
 }
@@ -744,7 +743,7 @@ mono_class_static_field_address (MonoDomain *domain, MonoClassField *field)
 
        mono_class_init (field->parent);
 
-       vtable = mono_class_vtable (domain, field->parent);
+       vtable = mono_class_vtable_full (domain, field->parent, TRUE);
        if (!vtable->initialized)
                mono_runtime_class_init (vtable);
 
@@ -900,7 +899,7 @@ mono_lconv_to_r8_un (guint64 a)
 gpointer
 mono_helper_compile_generic_method (MonoObject *obj, MonoMethod *method, gpointer *this_arg)
 {
-       MonoMethod *vmethod, *inflated;
+       MonoMethod *vmethod;
        gpointer addr;
        MonoGenericContext *context = mono_method_get_context (method);
 
@@ -909,20 +908,14 @@ mono_helper_compile_generic_method (MonoObject *obj, MonoMethod *method, gpointe
        if (obj == NULL)
                mono_raise_exception (mono_get_exception_null_reference ());
        vmethod = mono_object_get_virtual_method (obj, method);
-
-       /* 'vmethod' is partially inflated.  All the blanks corresponding to the type parameters of the
-          declaring class have been inflated.  We still need to fully inflate the method parameters.
-
-          FIXME: This code depends on the declaring class being fully inflated, since we inflate it twice with 
-          the same context.
-       */
        g_assert (!vmethod->klass->generic_container);
        g_assert (!vmethod->klass->generic_class || !vmethod->klass->generic_class->context.class_inst->is_open);
        g_assert (!context->method_inst || !context->method_inst->is_open);
-       inflated = mono_class_inflate_generic_method (vmethod, context);
-       if (mono_method_needs_static_rgctx_invoke (inflated, FALSE))
-               inflated = mono_marshal_get_static_rgctx_invoke (inflated);
-       addr = mono_compile_method (inflated);
+
+       addr = mono_compile_method (vmethod);
+
+       if (mono_method_needs_static_rgctx_invoke (vmethod, FALSE))
+               addr = mono_create_static_rgctx_trampoline (vmethod, addr);
 
        /* Since this is a virtual call, have to unbox vtypes */
        if (obj->vtable->klass->valuetype)