merge r67228-r67235, r67237, r67251 and r67256-67259 to trunk (they are

[mono.git] / mono / metadata / marshal.c

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index d9329af8138d4b6c7454ddcb257d6a0dc9998756..a86b6ba26fbbd708a4990276a69d18cc7da6cef2 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -1933,7 +1933,7 @@ emit_object_to_ptr_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv
 
                mono_mb_emit_ldloc (mb, 0);
                mono_mb_emit_byte (mb, CEE_LDIND_REF);
-               pos = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
+               pos = mono_mb_emit_branch (mb, CEE_BRFALSE);
 
                if (eklass->blittable) {
                        mono_mb_emit_ldloc (mb, 1);
@@ -2002,7 +2002,7 @@ emit_object_to_ptr_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv
                        mono_mb_emit_stloc (mb, 1);
                }
 
-               mono_mb_patch_short_branch (mb, pos);
+               mono_mb_patch_branch (mb, pos);
                break;
        }
        case MONO_MARSHAL_CONV_ARRAY_BYVALCHARARRAY: {
@@ -2027,7 +2027,7 @@ emit_object_to_ptr_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv
                
                mono_mb_emit_ldloc (mb, 0);
                mono_mb_emit_byte (mb, CEE_LDIND_I);
-               pos = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);
+               pos = mono_mb_emit_branch (mb, CEE_BRFALSE);
                
                /* save the old src pointer */
                mono_mb_emit_ldloc (mb, 0);
@@ -2052,7 +2052,7 @@ emit_object_to_ptr_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv
                mono_mb_emit_ldloc (mb, dst_var);
                mono_mb_emit_stloc (mb, 1);
 
-               mono_mb_patch_short_branch (mb, pos);
+               mono_mb_patch_branch (mb, pos);
                break;
        }
        case MONO_MARSHAL_CONV_OBJECT_INTERFACE:
@@ -7833,6 +7833,7 @@ mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass,
        /* fixme: howto handle this ? */
        if (sig->hasthis) {
                if (this) {
+                       /* FIXME: need a solution for the moving GC here */
                        mono_mb_emit_ptr (mb, this);
                } else {
                        /* fixme: */