2010-03-31 Miguel de Icaza <miguel@novell.com>

	* marshal.c (emit_marshal_boolean): Eliminate possible
	uninitialized local warning.

svn path=/trunk/mono/; revision=154552

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 00169e9142e4aea29db44fafe335e9c54f561936..bf9cc949402226d00d28ae3eccd140ec4dad9cb0 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31  Miguel de Icaza  <miguel@novell.com>
+
+       * marshal.c (emit_marshal_boolean): Eliminate possible
+       uninitialized local warning. 
+
 2010-03-30  Sebastien Pouliot  <sebastien@ximian.com>
 
        * class.c (mono_class_init): Postpone coreclr inheritance check

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 0394014fe9c7dc711f94c8d6ad04d14b440a0a61..277fe2f5767985c3062ec6e719b4795543f2feff 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -7631,11 +7631,11 @@ emit_marshal_boolean (EmitMarshalContext *m, int argnum, MonoType *t,
                
                /* Check null */
                if (t->byref) {
-                       
                        label_null = mono_mb_emit_branch (mb, CEE_BRFALSE);
                        mono_mb_emit_ldarg (mb, argnum);
                        mono_mb_emit_byte (mb, ldop);
-               }
+               } else
+                       label_null = 0;
 
                label_false = mono_mb_emit_branch (mb, CEE_BRFALSE);
                mono_mb_emit_byte (mb, CEE_LDC_I4_1);