Author: zoltan
Date: 2007-07-22 12:05:52 -0400 (Sun, 22 Jul 2007)
New Revision: 82444
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/loader.c
Log:
2007-07-22 Zoltan Varga <[EMAIL PROTECTED]>
* loader.c (mono_method_get_param_token): Make this work on generic
methods.
Return 0x8000000 for return parameters. Fixes #82161.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-07-22 15:41:51 UTC (rev 82443)
+++ trunk/mono/mono/metadata/ChangeLog 2007-07-22 16:05:52 UTC (rev 82444)
@@ -1,3 +1,8 @@
+2007-07-22 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * loader.c (mono_method_get_param_token): Make this work on generic
methods.
+ Return 0x8000000 for return parameters. Fixes #82161.
+
2007-07-21 Marek Habersack <[EMAIL PROTECTED]>
* appdomain.c (get_shadow_assembly_location): append the current
Modified: trunk/mono/mono/metadata/loader.c
===================================================================
--- trunk/mono/mono/metadata/loader.c 2007-07-22 15:41:51 UTC (rev 82443)
+++ trunk/mono/mono/metadata/loader.c 2007-07-22 16:05:52 UTC (rev 82444)
@@ -1605,9 +1605,6 @@
MonoTableInfo *methodt;
guint32 idx;
- if (klass->generic_class)
- g_assert_not_reached ();
-
mono_class_init (klass);
if (klass->image->dynamic) {
@@ -1619,7 +1616,11 @@
if (idx > 0) {
guint param_index = mono_metadata_decode_row_col (methodt, idx
- 1, MONO_METHOD_PARAMLIST);
- return mono_metadata_make_token (MONO_TABLE_PARAM, param_index
+ index);
+ if (index == -1)
+ /* Return value */
+ return mono_metadata_make_token (MONO_TABLE_PARAM, 0);
+ else
+ return mono_metadata_make_token (MONO_TABLE_PARAM,
param_index + index);
}
return 0;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches