Author: miguel
Date: 2006-01-29 18:55:21 -0500 (Sun, 29 Jan 2006)
New Revision: 56231
Modified:
branches/mono-1-1-13/mono/mono/metadata/icall.c
Log:
Backport fix to branch
Modified: branches/mono-1-1-13/mono/mono/metadata/icall.c
===================================================================
--- branches/mono-1-1-13/mono/mono/metadata/icall.c 2006-01-29 23:55:12 UTC
(rev 56230)
+++ branches/mono-1-1-13/mono/mono/metadata/icall.c 2006-01-29 23:55:21 UTC
(rev 56231)
@@ -1797,6 +1797,8 @@
MONO_ARCH_SAVE_REGS;
+ if (type->type->byref)
+ return NULL;
if (type->type->type == MONO_TYPE_VAR)
class = type->type->data.generic_param->owner->klass;
else if (type->type->type == MONO_TYPE_MVAR)
@@ -2013,7 +2015,7 @@
MONO_ARCH_SAVE_REGS;
if (type->type->type == MONO_TYPE_VAR || type->type->type ==
MONO_TYPE_MVAR)
- return TRUE;
+ return !type->type->byref;
return FALSE;
}
@@ -2023,7 +2025,7 @@
MONO_ARCH_SAVE_REGS;
if (tb->type.type->type == MONO_TYPE_VAR || tb->type.type->type ==
MONO_TYPE_MVAR)
- return TRUE;
+ return !tb->type.type->byref;
return FALSE;
}
@@ -2387,7 +2389,7 @@
MONO_ARCH_SAVE_REGS;
- if (type->type->type != MONO_TYPE_MVAR)
+ if (type->type->byref || type->type->type != MONO_TYPE_MVAR)
return NULL;
method = type->type->data.generic_param->method;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches