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 bb28bbefa59d87de301a40e80205c80d0f6609d1..a86b6ba26fbbd708a4990276a69d18cc7da6cef2 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -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: */