Author: zoltan
Date: 2006-09-14 11:47:04 -0400 (Thu, 14 Sep 2006)
New Revision: 65409
Modified:
Log:
2006-09-14 Zoltan Varga <vargaz (AT) gmail (DOT) com>
* marshal.c (emit_marshal_object): Fix marshalling of blittable classes and null.
Modified:
2006-09-14 15:44:26 UTC (rev 65408)
2006-09-14 15:47:04 UTC (rev 65409)
@@ -1,3 +1,7 @@
+2006-09-14 Zoltan Varga <vargaz (AT) gmail (DOT) com>
+
+* marshal.c (emit_marshal_object): Fix marshalling of blittable classes and null.
+
2006-09-14 Jonathan Chambers <joncham (AT) gmail (DOT) com>
* environment.c ():
Modified:
2006-09-14 15:44:26 UTC (rev 65408)
2006-09-14 15:47:04 UTC (rev 65409)
@@ -5782,9 +5782,17 @@
mono_mb_emit_stloc (mb, conv_arg);
} else if (klass->blittable) {
+mono_mb_emit_byte (mb, CEE_LDNULL);
+mono_mb_emit_stloc (mb, conv_arg);
+
mono_mb_emit_ldarg (mb, argnum);
+pos = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+mono_mb_emit_ldarg (mb, argnum);
mono_mb_emit_ldflda (mb, sizeof (M));
mono_mb_emit_stloc (mb, conv_arg);
+
+mono_mb_patch_branch (mb, pos);
break;
} else {
mono_mb_emit_byte (mb, CEE_LDNULL);
Mono-patches maillist - Mono-patches (AT) lists (DOT) ximian.com