Fix processing of double vararg arguments on 32 bit platforms.

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index a8b9b8933b26b376a47c21334b2caf5401e12958..cdc8665d019d23433fd42ed0f769e86d977d85a7 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -7186,8 +7186,9 @@ mono_ArgIterator_IntGetNextArg (MonoArgIterator *iter)
 
        res.type = iter->sig->params [i];
        res.klass = mono_class_from_mono_type (res.type);
-       res.value = iter->args;
        arg_size = mono_type_stack_size (res.type, &align);
+       iter->args = (guint8*)(((gsize)iter->args + (align) - 1) & ~(align - 1));
+       res.value = iter->args;
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
        if (arg_size <= sizeof (gpointer)) {
                int dummy;
@@ -7221,8 +7222,9 @@ mono_ArgIterator_IntGetNextArgT (MonoArgIterator *iter, MonoType *type)
                res.type = iter->sig->params [i];
                res.klass = mono_class_from_mono_type (res.type);
                /* FIXME: endianess issue... */
-               res.value = iter->args;
                arg_size = mono_type_stack_size (res.type, &align);
+               iter->args = (guint8*)(((gsize)iter->args + (align) - 1) & ~(align - 1));
+               res.value = iter->args;
                iter->args = (char*)iter->args + arg_size;
                iter->next_arg++;
                /* g_print ("returning arg %d, type 0x%02x of size %d at %p\n", i, res.type->type, arg_size, res.value); */