Author: zoltan
Date: 2008-02-20 15:47:01 -0500 (Wed, 20 Feb 2008)
New Revision: 96315
Modified:
branches/mono-1-9/mono/mono/metadata/ChangeLog
branches/mono-1-9/mono/mono/metadata/icall.c
Log:
2008-02-20 Zoltan Varga <[EMAIL PROTECTED]>
* icall.c (ves_icall_Type_GetPacking): Handle dynamic types.
Modified: branches/mono-1-9/mono/mono/metadata/ChangeLog
===================================================================
--- branches/mono-1-9/mono/mono/metadata/ChangeLog 2008-02-20 20:45:20 UTC
(rev 96314)
+++ branches/mono-1-9/mono/mono/metadata/ChangeLog 2008-02-20 20:47:01 UTC
(rev 96315)
@@ -1,5 +1,9 @@
2008-02-20 Zoltan Varga <[EMAIL PROTECTED]>
+ * icall.c (ves_icall_Type_GetPacking): Handle dynamic types.
+
+2008-02-20 Zoltan Varga <[EMAIL PROTECTED]>
+
* assembly.c (mono_assembly_load_from_full): Return the non-refonly
corlib for
ref-only requests for compatibility with MS.
Modified: branches/mono-1-9/mono/mono/metadata/icall.c
===================================================================
--- branches/mono-1-9/mono/mono/metadata/icall.c 2008-02-20 20:45:20 UTC
(rev 96314)
+++ branches/mono-1-9/mono/mono/metadata/icall.c 2008-02-20 20:47:01 UTC
(rev 96315)
@@ -1932,9 +1932,13 @@
{
MonoClass *klass = mono_class_from_mono_type (type->type);
- g_assert (!klass->image->dynamic);
-
- mono_metadata_packing_from_typedef (klass->image, klass->type_token,
packing, size);
+ if (klass->image->dynamic) {
+ MonoReflectionTypeBuilder *tb =
(MonoReflectionTypeBuilder*)type;
+ *packing = tb->packing_size;
+ *size = tb->class_size;
+ } else {
+ mono_metadata_packing_from_typedef (klass->image,
klass->type_token, packing, size);
+ }
}
static MonoReflectionType*
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
