X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fgeneric-sharing.c;h=5721e4dfeed2adfabab92245d66cbd29f16e2940;hb=11d9cfa6949c3599f30dd63d0b0ce4dd656731fd;hp=fd55c59e7d97a7350946142630232427400bd6b0;hpb=4e54bd0bd81ce6e8fd21bf34b9a542a36aa9ec44;p=mono.git

diff --git a/mono/mini/generic-sharing.c b/mono/mini/generic-sharing.c
index fd55c59e7d9..5721e4dfeed 100644
--- 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;
 		}
 	}