Author: joncham
Date: 2007-01-11 16:26:54 -0500 (Thu, 11 Jan 2007)
New Revision: 70884

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/marshal.c
Log:
2007-01-11  Jonathan Chambers  <[EMAIL PROTECTED]>

        * marshal.c (emit_marshal_variant): Fix conv_arg
        type in last commit, based on whether parameter is byref.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2007-01-11 20:16:02 UTC (rev 70883)
+++ trunk/mono/mono/metadata/ChangeLog  2007-01-11 21:26:54 UTC (rev 70884)
@@ -1,5 +1,10 @@
 2007-01-11  Jonathan Chambers  <[EMAIL PROTECTED]>
 
+       * marshal.c (emit_marshal_variant): Fix conv_arg
+       type in last commit, based on whether parameter is byref.
+       
+2007-01-11  Jonathan Chambers  <[EMAIL PROTECTED]>
+
        * marshal.c (emit_marshal_variant): Handle unmanaged->managed
        marshalling.
        (mono_marshal_emit_managed_wrapper): Convert byref arguments of type

Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c  2007-01-11 20:16:02 UTC (rev 70883)
+++ trunk/mono/mono/metadata/marshal.c  2007-01-11 21:26:54 UTC (rev 70884)
@@ -6802,8 +6802,12 @@
 
        switch (action) {
        case MARSHAL_ACTION_CONV_IN: {
-               *conv_arg_type = &mono_defaults.variant_class->byval_arg;
                conv_arg = mono_mb_add_local (mb, 
&mono_defaults.variant_class->byval_arg);
+               
+               if (t->byref)
+                       *conv_arg_type = &mono_defaults.variant_class->this_arg;
+               else
+                       *conv_arg_type = 
&mono_defaults.variant_class->byval_arg;
 
                if (t->byref && t->attrs & PARAM_ATTRIBUTE_OUT)
                        break;
@@ -6850,9 +6854,13 @@
        }
 
        case MARSHAL_ACTION_MANAGED_CONV_IN: {
-               *conv_arg_type = &mono_defaults.variant_class->this_arg;
                conv_arg = mono_mb_add_local (mb, 
&mono_defaults.object_class->byval_arg);
 
+               if (t->byref)
+                       *conv_arg_type = &mono_defaults.variant_class->this_arg;
+               else
+                       *conv_arg_type = 
&mono_defaults.variant_class->byval_arg;
+
                if (t->byref && t->attrs & PARAM_ATTRIBUTE_OUT)
                        break;
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to