2008-05-26 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / generic-sharing.c

diff --git a/mono/mini/generic-sharing.c b/mono/mini/generic-sharing.c
index fd55c59e7d97a7350946142630232427400bd6b0..5721e4dfeed2adfabab92245d66cbd29f16e2940 100644 (file)
--- a/mono/mini/generic-sharing.c
+++ b/mono/mini/generic-sharing.c
@@ -31,8 +31,8 @@ mini_method_get_context (MonoMethod *method)
 {
        if (method->is_inflated)
                return mono_method_get_context (method);
-       if (method->generic_container)
-               return &method->generic_container->context;
+       if (method->is_generic)
+               return &(mono_method_get_generic_container (method)->context);
        if (method->klass->generic_container)
                return &method->klass->generic_container->context;
        return NULL;
@@ -137,10 +137,10 @@ mono_method_is_generic_sharable_impl (MonoMethod *method)
 
                g_assert (inflated->declaring);
 
-               if (inflated->declaring->generic_container) {
-                       g_assert (inflated->declaring->generic_container->type_params);
+               if (inflated->declaring->is_generic) {
+                       g_assert (mono_method_get_generic_container (inflated->declaring)->type_params);
 
-                       if (inflated->declaring->generic_container->type_params->constraints)
+                       if (mono_method_get_generic_container (inflated->declaring)->type_params->constraints)
                                return FALSE;
                }
        }