Imported Upstream version 4.2.1.91

Former-commit-id: b6ad0994c58eaf044e2599fe2ff7996e073c87d2
This commit is contained in:
Xamarin Public Jenkins
2015-10-30 12:42:46 -04:00
committed by Jo Shields
parent bdd40f83c0
commit bac3554225
48 changed files with 211 additions and 83 deletions

View File

@@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.2.1.60/804ddbc\"" > version.h
echo "#define FULL_VERSION \"Stable 4.2.1.91/8862921\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

View File

@@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.2.1.60/804ddbc\"" > version.h
echo "#define FULL_VERSION \"Stable 4.2.1.91/8862921\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

View File

@@ -1 +1 @@
080f9cc654f5abb2d7030948dfd47427b8979777
cc5a13de3ef26e6c31e86204057f98f071d1db3b

View File

@@ -1 +1 @@
0458c47551638425b42b9b304999eab0ae33938f
9f1ffc219a37d5eeeb79f9ec05eeb38218fe628c

View File

@@ -2781,4 +2781,20 @@ END:
IL_001d: ldc.i4.1
IL_001e: ret
} // end of method Tests::test_0_fceq_r4
.method public static int32 test_0_switch_loop () cil managed
{
.maxstack 16
.locals init (valuetype Tests/TailCallStruct V_0, int32 V_1)
ldc.i4.0
ldloc.0
ldloc.1
brtrue L_1
L_0:
ldc.i4.4
switch (L_0)
L_1:
pop
ret
}
}

View File

@@ -1 +1 @@
24b171b7d02edaa3d317cb6d27de214a3e476267
cb63252e0018b9aefb43fe181130006eafb121b8

View File

@@ -1192,6 +1192,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
MonoJumpInfoVirtMethod *info = data;
MonoClass *iface_class = info->method->klass;
MonoMethod *method;
MonoError error;
int ioffset, slot;
gpointer addr;
@@ -1208,6 +1209,8 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
g_assert (info->klass->vtable);
method = info->klass->vtable [ioffset + slot];
method = mono_class_inflate_generic_method_checked (method, context, &error);
addr = mono_compile_method (method);
return mini_add_method_trampoline (method, addr, mono_method_needs_static_rgctx_invoke (method, FALSE), FALSE);
}

View File

@@ -1 +1 @@
a261c17d24d07d1c29cbb197cabc259fe882f1b7
666db656def6f046f9979d20d4a061f7ed66a72d

View File

@@ -1 +1 @@
#define FULL_VERSION "Stable 4.2.1.60/804ddbc"
#define FULL_VERSION "Stable 4.2.1.91/8862921"