Author: martin
Date: 2005-06-20 12:19:22 -0400 (Mon, 20 Jun 2005)
New Revision: 46244
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/loader.c
Log:
2005-06-20 Martin Baulig <[EMAIL PROTECTED]>
* loader.c (method_from_methodspec): Apply a patch from
Kamil Skalski <[EMAIL PROTECTED]> to fix #75296.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-06-20 16:09:27 UTC (rev 46243)
+++ trunk/mono/mono/metadata/ChangeLog 2005-06-20 16:19:22 UTC (rev 46244)
@@ -1,5 +1,10 @@
2005-06-20 Martin Baulig <[EMAIL PROTECTED]>
+ * loader.c (method_from_methodspec): Apply a patch from
+ Kamil Skalski <[EMAIL PROTECTED]> to fix #75296.
+
+2005-06-20 Martin Baulig <[EMAIL PROTECTED]>
+
* class.c (mono_class_init): Reverted Zoltan's last change; it
breaks generics.
Modified: trunk/mono/mono/metadata/loader.c
===================================================================
--- trunk/mono/mono/metadata/loader.c 2005-06-20 16:09:27 UTC (rev 46243)
+++ trunk/mono/mono/metadata/loader.c 2005-06-20 16:19:22 UTC (rev 46244)
@@ -501,8 +501,13 @@
gmethod = g_new0 (MonoGenericMethod, 1);
gmethod->container = container;
+ if (context && context -> gmethod)
+ new_context = context -> gmethod -> container;
+ else
+ new_context = context ? context->container : NULL;
+
gmethod->inst = mono_metadata_parse_generic_inst (
- image, (MonoGenericContext *) context ? context->container :
NULL,
+ image, new_context,
param_count, ptr, &ptr);
if (context)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
