diff options
Diffstat (limited to 'tests/src/JIT/Methodical')
-rw-r--r-- | tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj | 3 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj | 3 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/refany/format.cs | 10 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/refany/format.il | 50 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/refany/longsig.il | 50 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/refany/shortsig.il | 50 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj | 3 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj | 4 |
8 files changed, 114 insertions, 59 deletions
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj index a4054021e7..a694797c3c 100644 --- a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj +++ b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj @@ -15,8 +15,9 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - <!-- NOTE: this test simply takes too long to complete under GC stress; it is not fundamentally incompatible --> + <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible --> <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible> + <HeapVerifyIncompatible>true</HeapVerifyIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj index bd5ae97d4b..4b75ff430d 100644 --- a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj +++ b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj @@ -15,8 +15,9 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - <!-- NOTE: this test simply takes too long to complete under GC stress; it is not fundamentally incompatible --> + <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible --> <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible> + <HeapVerifyIncompatible>true</HeapVerifyIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/tests/src/JIT/Methodical/refany/format.cs b/tests/src/JIT/Methodical/refany/format.cs index 7b4c90cacc..33f9273c1a 100644 --- a/tests/src/JIT/Methodical/refany/format.cs +++ b/tests/src/JIT/Methodical/refany/format.cs @@ -6,6 +6,16 @@ using System; namespace JitTest { + public enum PlatformID + { + MacOSX = 6, + Unix = 4, + Win32NT = 2, + Win32S = 0, + Win32Windows = 1, + WinCE = 3, + Xbox = 5, + } internal enum Mood { good, diff --git a/tests/src/JIT/Methodical/refany/format.il b/tests/src/JIT/Methodical/refany/format.il index 41bd149185..86cae213bc 100644 --- a/tests/src/JIT/Methodical/refany/format.il +++ b/tests/src/JIT/Methodical/refany/format.il @@ -17,6 +17,18 @@ .module format.exe .namespace JitTest { + .class public auto ansi sealed PlatformID + extends [mscorlib]System.Enum + { + .field public specialname rtspecialname int32 value__ + .field public static literal valuetype JitTest.PlatformID MacOSX = int32(0x00000006) + .field public static literal valuetype JitTest.PlatformID Unix = int32(0x00000004) + .field public static literal valuetype JitTest.PlatformID Win32NT = int32(0x00000002) + .field public static literal valuetype JitTest.PlatformID Win32S = int32(0x00000000) + .field public static literal valuetype JitTest.PlatformID Win32Windows = int32(0x00000001) + .field public static literal valuetype JitTest.PlatformID WinCE = int32(0x00000003) + .field public static literal valuetype JitTest.PlatformID Xbox = int32(0x00000005) + } // end of class JitTest.PlatformID .class value private auto ansi serializable sealed Mood extends [mscorlib]System.Enum { @@ -37,7 +49,7 @@ .field private float64 m_dbl .field private bool m_b .field private static value class [mscorlib]System.DateTime m_t - .field private value class [mscorlib]System.PlatformID m_pid + .field private value class JitTest.PlatformID m_pid .field private value class JitTest.Mood m_mood .method private hidebysig static string Format(typedref format, @@ -401,7 +413,7 @@ IL_031d: ldarg.1 IL_031e: refanytype IL_0320: call class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle) - IL_0325: ldtoken [mscorlib]System.PlatformID + IL_0325: ldtoken JitTest.PlatformID IL_032a: call class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle) IL_032f: beq.s IL_0337 @@ -410,9 +422,9 @@ IL_0337: ldloc.2 IL_0338: ldarg.1 - IL_0339: refanyval [mscorlib]System.PlatformID - ldobj [mscorlib]System.PlatformID - IL_033e: box [mscorlib]System.PlatformID + IL_0339: refanyval JitTest.PlatformID + ldobj JitTest.PlatformID + IL_033e: box JitTest.PlatformID IL_0343: call instance string [mscorlib]System.Enum::ToString() IL_0348: call string [mscorlib]System.String::Concat(string, string) @@ -551,7 +563,7 @@ float64 V_5, bool V_6, value class [mscorlib]System.DateTime V_7, - value class [mscorlib]System.PlatformID V_8, + value class JitTest.PlatformID V_8, value class JitTest.Mood V_9) IL_0000: ldc.i4.s 10 IL_0002: stloc.0 @@ -644,7 +656,7 @@ string) IL_00f6: ldstr "{%p}" IL_00fb: ldloca.s V_8 - IL_00fd: mkrefany [mscorlib]System.PlatformID + IL_00fd: mkrefany JitTest.PlatformID IL_0102: ldstr "{Win32NT}" IL_0107: call void JitTest.TestClass::Test(string, typedref, @@ -732,8 +744,8 @@ string) IL_00e1: ldstr "{%p}" IL_00e6: ldarg.0 - IL_00e7: ldflda value class [mscorlib]System.PlatformID JitTest.TestClass::m_pid - IL_00ec: mkrefany [mscorlib]System.PlatformID + IL_00e7: ldflda value class JitTest.PlatformID JitTest.TestClass::m_pid + IL_00ec: mkrefany JitTest.PlatformID IL_00f1: ldstr "{Win32NT}" IL_00f6: call void JitTest.TestClass::Test(string, typedref, @@ -758,7 +770,7 @@ float64& dbl, bool& b, value class [mscorlib]System.DateTime& t, - value class [mscorlib]System.PlatformID& pid) il managed + value class JitTest.PlatformID& pid) il managed { .maxstack 5 IL_0000: ldstr "{%d}" @@ -825,7 +837,7 @@ string) IL_00bd: ldstr "{%p}" IL_00c2: ldarg.s pid - IL_00c4: mkrefany [mscorlib]System.PlatformID + IL_00c4: mkrefany JitTest.PlatformID IL_00c9: ldstr "{Win32NT}" IL_00ce: call void JitTest.TestClass::Test(string, typedref, @@ -845,7 +857,7 @@ float64 V_5, bool V_6, value class [mscorlib]System.DateTime V_7, - value class [mscorlib]System.PlatformID V_8) + value class JitTest.PlatformID V_8) IL_0000: ldc.i4.s 20 IL_0002: stloc.0 IL_0003: ldc.i4.s 21 @@ -888,7 +900,7 @@ float64&, bool&, value class [mscorlib]System.DateTime&, - value class [mscorlib]System.PlatformID&) + value class JitTest.PlatformID&) IL_0049: ret } // end of method TestClass::TestArgSlots @@ -904,7 +916,7 @@ float64[] V_5, bool[] V_6, value class [mscorlib]System.DateTime[] V_7, - value class [mscorlib]System.PlatformID[] V_8, + value class JitTest.PlatformID[] V_8, value class JitTest.Mood[] V_9, int32[] V_10, unsigned int32[] V_11, @@ -913,7 +925,7 @@ float32[] V_14, float64[] V_15, bool[] V_16, - value class [mscorlib]System.PlatformID[] V_17, + value class JitTest.PlatformID[] V_17, value class JitTest.Mood[] V_18) IL_0000: ldc.i4.1 IL_0001: newarr [mscorlib]System.Int32 @@ -993,7 +1005,7 @@ int32, int32) IL_00a3: ldc.i4.1 - IL_00a4: newarr [mscorlib]System.PlatformID + IL_00a4: newarr JitTest.PlatformID IL_00a9: stloc.s V_17 IL_00ab: ldloc.s V_17 IL_00ad: ldc.i4.0 @@ -1089,8 +1101,8 @@ IL_01b3: ldstr "{%p}" IL_01b8: ldloc.s V_8 IL_01ba: ldc.i4.0 - IL_01bb: ldelema [mscorlib]System.PlatformID - IL_01c0: mkrefany [mscorlib]System.PlatformID + IL_01bb: ldelema JitTest.PlatformID + IL_01c0: mkrefany JitTest.PlatformID IL_01c5: ldstr "{Win32NT}" IL_01ca: call void JitTest.TestClass::Test(string, typedref, @@ -1163,7 +1175,7 @@ IL_002d: stfld bool JitTest.TestClass::m_b IL_0032: ldarg.0 IL_0033: ldc.i4.2 - IL_0034: stfld value class [mscorlib]System.PlatformID JitTest.TestClass::m_pid + IL_0034: stfld value class JitTest.PlatformID JitTest.TestClass::m_pid IL_0039: ldarg.0 IL_003a: ldc.i4.0 IL_003b: stfld value class JitTest.Mood JitTest.TestClass::m_mood diff --git a/tests/src/JIT/Methodical/refany/longsig.il b/tests/src/JIT/Methodical/refany/longsig.il index 0aafa47aab..395d042595 100644 --- a/tests/src/JIT/Methodical/refany/longsig.il +++ b/tests/src/JIT/Methodical/refany/longsig.il @@ -17,6 +17,18 @@ .module format.exe .namespace JitTest { + .class public auto ansi sealed PlatformID + extends [mscorlib]System.Enum + { + .field public specialname rtspecialname int32 value__ + .field public static literal valuetype JitTest.PlatformID MacOSX = int32(0x00000006) + .field public static literal valuetype JitTest.PlatformID Unix = int32(0x00000004) + .field public static literal valuetype JitTest.PlatformID Win32NT = int32(0x00000002) + .field public static literal valuetype JitTest.PlatformID Win32S = int32(0x00000000) + .field public static literal valuetype JitTest.PlatformID Win32Windows = int32(0x00000001) + .field public static literal valuetype JitTest.PlatformID WinCE = int32(0x00000003) + .field public static literal valuetype JitTest.PlatformID Xbox = int32(0x00000005) + } // end of class JitTest.PlatformID .class value private auto ansi serializable sealed Mood extends [mscorlib]System.Enum { @@ -37,7 +49,7 @@ .field private float64 m_dbl .field private bool m_b .field private static value class [mscorlib]System.DateTime m_t - .field private value class [mscorlib]System.PlatformID m_pid + .field private value class JitTest.PlatformID m_pid .field private value class JitTest.Mood m_mood .method private hidebysig static string Format(typedref format, @@ -401,7 +413,7 @@ IL_031d: ldarg.1 IL_031e: refanytype IL_0320: call class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle) - IL_0325: ldtoken [mscorlib]System.PlatformID + IL_0325: ldtoken JitTest.PlatformID IL_032a: call class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle) IL_032f: beq.s IL_0337 @@ -410,9 +422,9 @@ IL_0337: ldloc.2 IL_0338: ldarg.1 - IL_0339: refanyval [mscorlib]System.PlatformID - ldobj [mscorlib]System.PlatformID - IL_033e: box [mscorlib]System.PlatformID + IL_0339: refanyval JitTest.PlatformID + ldobj JitTest.PlatformID + IL_033e: box JitTest.PlatformID IL_0343: call instance string [mscorlib]System.Enum::ToString() IL_0348: call string [mscorlib]System.String::Concat(string, string) @@ -551,7 +563,7 @@ [5] float64 V_5, [6] bool V_6, [7] value class [mscorlib]System.DateTime V_7, - [8] value class [mscorlib]System.PlatformID V_8, + [8] value class JitTest.PlatformID V_8, [9] value class JitTest.Mood V_9) IL_0000: ldc.i4.s 10 IL_0002: stloc.0 @@ -644,7 +656,7 @@ string) IL_00f6: ldstr "{%p}" IL_00fb: ldloca.s V_8 - IL_00fd: mkrefany [mscorlib]System.PlatformID + IL_00fd: mkrefany JitTest.PlatformID IL_0102: ldstr "{Win32NT}" IL_0107: call void JitTest.TestClass::Test(string, typedref, @@ -732,8 +744,8 @@ string) IL_00e1: ldstr "{%p}" IL_00e6: ldarg.0 - IL_00e7: ldflda value class [mscorlib]System.PlatformID JitTest.TestClass::m_pid - IL_00ec: mkrefany [mscorlib]System.PlatformID + IL_00e7: ldflda value class JitTest.PlatformID JitTest.TestClass::m_pid + IL_00ec: mkrefany JitTest.PlatformID IL_00f1: ldstr "{Win32NT}" IL_00f6: call void JitTest.TestClass::Test(string, typedref, @@ -758,7 +770,7 @@ float64& dbl, bool& b, value class [mscorlib]System.DateTime& t, - value class [mscorlib]System.PlatformID& pid) il managed + value class JitTest.PlatformID& pid) il managed { .maxstack 5 IL_0000: ldstr "{%d}" @@ -825,7 +837,7 @@ string) IL_00bd: ldstr "{%p}" IL_00c2: ldarg.s pid - IL_00c4: mkrefany [mscorlib]System.PlatformID + IL_00c4: mkrefany JitTest.PlatformID IL_00c9: ldstr "{Win32NT}" IL_00ce: call void JitTest.TestClass::Test(string, typedref, @@ -845,7 +857,7 @@ [5] float64 V_5, [6] bool V_6, [7] value class [mscorlib]System.DateTime V_7, - [8] value class [mscorlib]System.PlatformID V_8) + [8] value class JitTest.PlatformID V_8) IL_0000: ldc.i4.s 20 IL_0002: stloc.0 IL_0003: ldc.i4.s 21 @@ -888,7 +900,7 @@ float64&, bool&, value class [mscorlib]System.DateTime&, - value class [mscorlib]System.PlatformID&) + value class JitTest.PlatformID&) IL_0049: ret } // end of method TestClass::TestArgSlots @@ -904,7 +916,7 @@ [5] float64[] V_5, [6] bool[] V_6, [7] value class [mscorlib]System.DateTime[] V_7, - [8] value class [mscorlib]System.PlatformID[] V_8, + [8] value class JitTest.PlatformID[] V_8, [9] value class JitTest.Mood[] V_9, [10] int32[] V_10, [11] unsigned int32[] V_11, @@ -913,7 +925,7 @@ [14] float32[] V_14, [15] float64[] V_15, [16] bool[] V_16, - [17] value class [mscorlib]System.PlatformID[] V_17, + [17] value class JitTest.PlatformID[] V_17, [18] value class JitTest.Mood[] V_18) IL_0000: ldc.i4.1 IL_0001: newarr [mscorlib]System.Int32 @@ -993,7 +1005,7 @@ int32, int32) IL_00a3: ldc.i4.1 - IL_00a4: newarr [mscorlib]System.PlatformID + IL_00a4: newarr JitTest.PlatformID IL_00a9: stloc.s V_17 IL_00ab: ldloc.s V_17 IL_00ad: ldc.i4.0 @@ -1089,8 +1101,8 @@ IL_01b3: ldstr "{%p}" IL_01b8: ldloc.s V_8 IL_01ba: ldc.i4.0 - IL_01bb: ldelema [mscorlib]System.PlatformID - IL_01c0: mkrefany [mscorlib]System.PlatformID + IL_01bb: ldelema JitTest.PlatformID + IL_01c0: mkrefany JitTest.PlatformID IL_01c5: ldstr "{Win32NT}" IL_01ca: call void JitTest.TestClass::Test(string, typedref, @@ -1163,7 +1175,7 @@ IL_002d: stfld bool JitTest.TestClass::m_b IL_0032: ldarg.0 IL_0033: ldc.i4.2 - IL_0034: stfld value class [mscorlib]System.PlatformID JitTest.TestClass::m_pid + IL_0034: stfld value class JitTest.PlatformID JitTest.TestClass::m_pid IL_0039: ldarg.0 IL_003a: ldc.i4.0 IL_003b: stfld value class JitTest.Mood JitTest.TestClass::m_mood diff --git a/tests/src/JIT/Methodical/refany/shortsig.il b/tests/src/JIT/Methodical/refany/shortsig.il index f336dfd2a5..e013baeecc 100644 --- a/tests/src/JIT/Methodical/refany/shortsig.il +++ b/tests/src/JIT/Methodical/refany/shortsig.il @@ -16,6 +16,18 @@ } .namespace JitTest { + .class public auto ansi sealed PlatformID + extends [mscorlib]System.Enum + { + .field public specialname rtspecialname int32 value__ + .field public static literal valuetype JitTest.PlatformID MacOSX = int32(0x00000006) + .field public static literal valuetype JitTest.PlatformID Unix = int32(0x00000004) + .field public static literal valuetype JitTest.PlatformID Win32NT = int32(0x00000002) + .field public static literal valuetype JitTest.PlatformID Win32S = int32(0x00000000) + .field public static literal valuetype JitTest.PlatformID Win32Windows = int32(0x00000001) + .field public static literal valuetype JitTest.PlatformID WinCE = int32(0x00000003) + .field public static literal valuetype JitTest.PlatformID Xbox = int32(0x00000005) + } // end of class JitTest.PlatformID .class value private auto ansi serializable sealed Mood extends [mscorlib]System.Enum { @@ -36,7 +48,7 @@ .field private float64 m_dbl .field private bool m_b .field private static value class [mscorlib]System.DateTime m_t - .field private value class [mscorlib]System.PlatformID m_pid + .field private value class JitTest.PlatformID m_pid .field private value class JitTest.Mood m_mood .method private hidebysig static string Format(typedref format, @@ -400,7 +412,7 @@ IL_031d: ldarg.1 IL_031e: refanytype IL_0320: call class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle) - IL_0325: ldtoken [mscorlib]System.PlatformID + IL_0325: ldtoken JitTest.PlatformID IL_032a: call class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(value class [mscorlib]System.RuntimeTypeHandle) IL_032f: beq.s IL_0337 @@ -409,9 +421,9 @@ IL_0337: ldloc.2 IL_0338: ldarg.1 - IL_0339: refanyval [mscorlib]System.PlatformID - ldobj [mscorlib]System.PlatformID - IL_033e: box [mscorlib]System.PlatformID + IL_0339: refanyval JitTest.PlatformID + ldobj JitTest.PlatformID + IL_033e: box JitTest.PlatformID IL_0343: call instance string [mscorlib]System.Enum::ToString() IL_0348: call string [mscorlib]System.String::Concat(string, string) @@ -550,7 +562,7 @@ [5] float64 V_5, [6] bool V_6, [7] value class [mscorlib]System.DateTime V_7, - [8] value class [mscorlib]System.PlatformID V_8, + [8] value class JitTest.PlatformID V_8, [9] value class JitTest.Mood V_9) IL_0000: ldc.i4.s 10 IL_0002: stloc.0 @@ -643,7 +655,7 @@ string) IL_00f6: ldstr "{%p}" IL_00fb: ldloca.s V_8 - IL_00fd: mkrefany [mscorlib]System.PlatformID + IL_00fd: mkrefany JitTest.PlatformID IL_0102: ldstr "{Win32NT}" IL_0107: call void JitTest.TestClass::Test(string, typedref, @@ -731,8 +743,8 @@ string) IL_00e1: ldstr "{%p}" IL_00e6: ldarg.0 - IL_00e7: ldflda value class [mscorlib]System.PlatformID JitTest.TestClass::m_pid - IL_00ec: mkrefany [mscorlib]System.PlatformID + IL_00e7: ldflda value class JitTest.PlatformID JitTest.TestClass::m_pid + IL_00ec: mkrefany JitTest.PlatformID IL_00f1: ldstr "{Win32NT}" IL_00f6: call void JitTest.TestClass::Test(string, typedref, @@ -757,7 +769,7 @@ float64& dbl, bool& b, value class [mscorlib]System.DateTime& t, - value class [mscorlib]System.PlatformID& pid) il managed + value class JitTest.PlatformID& pid) il managed { .maxstack 5 IL_0000: ldstr "{%d}" @@ -824,7 +836,7 @@ string) IL_00bd: ldstr "{%p}" IL_00c2: ldarg.s pid - IL_00c4: mkrefany [mscorlib]System.PlatformID + IL_00c4: mkrefany JitTest.PlatformID IL_00c9: ldstr "{Win32NT}" IL_00ce: call void JitTest.TestClass::Test(string, typedref, @@ -844,7 +856,7 @@ [5] float64 V_5, [6] bool V_6, [7] value class [mscorlib]System.DateTime V_7, - [8] value class [mscorlib]System.PlatformID V_8) + [8] value class JitTest.PlatformID V_8) IL_0000: ldc.i4.s 20 IL_0002: stloc.0 IL_0003: ldc.i4.s 21 @@ -887,7 +899,7 @@ float64&, bool&, value class [mscorlib]System.DateTime&, - value class [mscorlib]System.PlatformID&) + value class JitTest.PlatformID&) IL_0049: ret } // end of method TestClass::TestArgSlots @@ -903,7 +915,7 @@ [5] float64[] V_5, [6] bool[] V_6, [7] value class [mscorlib]System.DateTime[] V_7, - [8] value class [mscorlib]System.PlatformID[] V_8, + [8] value class JitTest.PlatformID[] V_8, [9] value class JitTest.Mood[] V_9, [10] int32[] V_10, [11] unsigned int32[] V_11, @@ -912,7 +924,7 @@ [14] float32[] V_14, [15] float64[] V_15, [16] bool[] V_16, - [17] value class [mscorlib]System.PlatformID[] V_17, + [17] value class JitTest.PlatformID[] V_17, [18] value class JitTest.Mood[] V_18) IL_0000: ldc.i4.1 IL_0001: newarr [mscorlib]System.Int32 @@ -992,7 +1004,7 @@ int32, int32) IL_00a3: ldc.i4.1 - IL_00a4: newarr [mscorlib]System.PlatformID + IL_00a4: newarr JitTest.PlatformID IL_00a9: stloc.s V_17 IL_00ab: ldloc.s V_17 IL_00ad: ldc.i4.0 @@ -1088,8 +1100,8 @@ IL_01b3: ldstr "{%p}" IL_01b8: ldloc.s V_8 IL_01ba: ldc.i4.0 - IL_01bb: ldelema [mscorlib]System.PlatformID - IL_01c0: mkrefany [mscorlib]System.PlatformID + IL_01bb: ldelema JitTest.PlatformID + IL_01c0: mkrefany JitTest.PlatformID IL_01c5: ldstr "{Win32NT}" IL_01ca: call void JitTest.TestClass::Test(string, typedref, @@ -1162,7 +1174,7 @@ IL_002d: stfld bool JitTest.TestClass::m_b IL_0032: ldarg.0 IL_0033: ldc.i4.2 - IL_0034: stfld value class [mscorlib]System.PlatformID JitTest.TestClass::m_pid + IL_0034: stfld value class JitTest.PlatformID JitTest.TestClass::m_pid IL_0039: ldarg.0 IL_003a: ldc.i4.0 IL_003b: stfld value class JitTest.Mood JitTest.TestClass::m_mood diff --git a/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj b/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj index 72167fc191..d55824a331 100644 --- a/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj +++ b/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj @@ -14,6 +14,9 @@ <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> + + <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. --> + <HeapVerifyIncompatible>true</HeapVerifyIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj b/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj index 5d149734f4..f92efe2970 100644 --- a/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj +++ b/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj @@ -14,6 +14,10 @@ <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> + + <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. --> + <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible> + <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |