Fix ILGeneration tests errors

Author: jkurdek

src/mono/mono/metadata/marshal-lightweight.c

@@ -2829,18 +2829,21 @@ emit_managed_wrapper_ilgen (MonoMethodBuilder *mb, MonoMethodSignature *invoke_s
 
 	/* we first do all conversions */
 	tmp_locals = g_newa (int, sig->param_count);
+	int arg_shift = 0; // used to skip arguments when we have lowered structs
 	for (i = 0; i < sig->param_count; i ++) {
 		MonoType *t = sig->params [i];
 		MonoMarshalSpec *spec = mspecs [i + 1];
 
 		if (spec && spec->native == MONO_NATIVE_CUSTOM) {
-			tmp_locals [i] = mono_emit_marshal (m, i, t, mspecs [i + 1], 0,  &sig->params [i], MARSHAL_ACTION_MANAGED_CONV_IN);
+			tmp_locals [i] = mono_emit_marshal (m, i, t, mspecs [i + 1], 0,  &csig->params [i + arg_shift], MARSHAL_ACTION_MANAGED_CONV_IN);
 		} else {
 			switch (t->type) {
 			case MONO_TYPE_VALUETYPE:
 				if (mono_method_signature_has_ext_callconv (csig, MONO_EXT_CALLCONV_SWIFTCALL))
 				{
 					tmp_locals [i] = 0;
+					if(!swift_lowering[i].by_reference)
+						arg_shift+=swift_lowering[i].num_lowered_elements - 1;
 					break;
 				}
 			case MONO_TYPE_OBJECT:
@@ -2849,7 +2852,7 @@ emit_managed_wrapper_ilgen (MonoMethodBuilder *mb, MonoMethodSignature *invoke_s
 			case MONO_TYPE_SZARRAY:
 			case MONO_TYPE_STRING:
 			case MONO_TYPE_BOOLEAN:
-				tmp_locals [i] = mono_emit_marshal (m, i, t, mspecs [i + 1], 0, &sig->params [i], MARSHAL_ACTION_MANAGED_CONV_IN);
+				tmp_locals [i] = mono_emit_marshal (m, i, t, mspecs [i + 1], 0, &csig->params [i + arg_shift], MARSHAL_ACTION_MANAGED_CONV_IN);
 				break;
 			default:
 				tmp_locals [i] = 0;
@@ -2873,7 +2876,7 @@ emit_managed_wrapper_ilgen (MonoMethodBuilder *mb, MonoMethodSignature *invoke_s
 		mono_mb_emit_icall (mb, mono_gchandle_get_target_internal);
 	}
 
-	int arg_shift = 0;
+	arg_shift = 0;
 	int lowered_struct_so_far = 0;
 	for (i = 0; i < csig->param_count; i++) {
 		MonoType *t = csig->params [i];

src/mono/mono/metadata/marshal.c

@@ -4091,7 +4091,6 @@ static MonoMethod *
 marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, MonoGCHandle target_handle, gboolean runtime_init_callback, MonoError *error)
 {
 	SwiftPhysicalLowering *swift_lowering;
-	int **tmp_struct_locals;
 	MonoMethodSignature *sig, *csig, *invoke_sig;
 	MonoMethodBuilder *mb;
 	MonoMethod *res, *invoke;
@@ -4190,24 +4189,21 @@ marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, Mono
 		MonoClass *swift_self = mono_class_try_get_swift_self_class ();
 		MonoClass *swift_error = mono_class_try_get_swift_error_class ();
 		swift_lowering = g_newa (SwiftPhysicalLowering, sig->param_count);
-		tmp_struct_locals = g_newa (int*, sig->param_count);
 		GArray *new_params = g_array_sized_new (FALSE, FALSE, sizeof (MonoType*), csig->param_count);
 		uint32_t new_param_count = 0;
 
 
 
-		for (int i =0; i < csig->param_count; i++) {
-			MonoType *ptype = csig->params [i];
+		for (int j =0; j < csig->param_count; j++) {
+			MonoType *ptype = csig->params [j];
 			MonoClass *klass = mono_class_from_mono_type_internal (ptype);
-			tmp_struct_locals [i] = NULL;
 
 			if (mono_type_is_struct (ptype) && !(klass == swift_self || klass == swift_error)) 
 			{
 				SwiftPhysicalLowering lowered_swift_struct = mono_marshal_get_swift_physical_lowering (ptype, FALSE);
 				if (!lowered_swift_struct.by_reference) 
 				{
-					swift_lowering [i] = lowered_swift_struct;
-					tmp_struct_locals [i] = g_newa (int, lowered_swift_struct.num_lowered_elements);
+					swift_lowering [j] = lowered_swift_struct;
 
 					for (uint32_t idx_lowered = 0; idx_lowered < lowered_swift_struct.num_lowered_elements; ++idx_lowered) {
 						g_array_append_val (new_params, lowered_swift_struct.lowered_elements [idx_lowered]);