diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs index 816b567c2e6537..ae1d12d57b0f84 100644 --- a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs +++ b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs @@ -305,10 +305,15 @@ private static string GenerateStandaloneSimpleTestRunner(ImmutableArray alias != "global").Select(alias => $"extern alias {alias};"))); + builder.AppendLine("namespace __GeneratedMainWrapper;"); + builder.AppendLine("class __GeneratedMainWrapper {"); + builder.AppendLine("public static int Main() {"); builder.AppendLine("try {"); builder.AppendLine(string.Join("\n", testInfos.Select(m => m.GenerateTestExecution(reporter)))); builder.AppendLine("} catch(System.Exception ex) { System.Console.WriteLine(ex.ToString()); return 101; }"); builder.AppendLine("return 100;"); + builder.AppendLine("}"); + builder.AppendLine("}"); return builder.ToString(); } diff --git a/src/tests/JIT/Directed/Arrays/Complex1.csproj b/src/tests/JIT/Directed/Arrays/Complex1.csproj index 92d196ae4184d6..55952fd1ae229c 100644 --- a/src/tests/JIT/Directed/Arrays/Complex1.csproj +++ b/src/tests/JIT/Directed/Arrays/Complex1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Arrays/Complex2.csproj b/src/tests/JIT/Directed/Arrays/Complex2.csproj index 9a249fbca6f181..9713580ab74a33 100644 --- a/src/tests/JIT/Directed/Arrays/Complex2.csproj +++ b/src/tests/JIT/Directed/Arrays/Complex2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Arrays/LoopCloning.cs b/src/tests/JIT/Directed/Arrays/LoopCloning.cs index ccc5e45c6e4c67..ee52e6e66026b0 100644 --- a/src/tests/JIT/Directed/Arrays/LoopCloning.cs +++ b/src/tests/JIT/Directed/Arrays/LoopCloning.cs @@ -5,10 +5,12 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.Intrinsics; +using Xunit; public class Program { - public static unsafe int Main() + [Fact] + public static unsafe int TestEntryPoint() { int result = 0; try { diff --git a/src/tests/JIT/Directed/Arrays/LoopCloning.csproj b/src/tests/JIT/Directed/Arrays/LoopCloning.csproj index c8c892477bb411..38146029bf0309 100644 --- a/src/tests/JIT/Directed/Arrays/LoopCloning.csproj +++ b/src/tests/JIT/Directed/Arrays/LoopCloning.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Arrays/Simple1.csproj b/src/tests/JIT/Directed/Arrays/Simple1.csproj index 3d64fba3ea5cf6..40623214b60d30 100644 --- a/src/tests/JIT/Directed/Arrays/Simple1.csproj +++ b/src/tests/JIT/Directed/Arrays/Simple1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Arrays/Simple2.csproj b/src/tests/JIT/Directed/Arrays/Simple2.csproj index c60878bc8c1287..3edbbb8ed3e67f 100644 --- a/src/tests/JIT/Directed/Arrays/Simple2.csproj +++ b/src/tests/JIT/Directed/Arrays/Simple2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Arrays/complex1.cs b/src/tests/JIT/Directed/Arrays/complex1.cs index bc1890a3be38ae..a8cdadc7adc6eb 100644 --- a/src/tests/JIT/Directed/Arrays/complex1.cs +++ b/src/tests/JIT/Directed/Arrays/complex1.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; // Do a complex 5 dimensional Jagged array. struct Complex @@ -13,10 +14,11 @@ public void mul_em() c = a * b; } }; -public -class Complex_Array_Test + +public class Complex_Array_Test { - public static int Main() + [Fact] + public static int TestEntryPoint() { Console.WriteLine("Starting..."); int SIZE = 10; diff --git a/src/tests/JIT/Directed/Arrays/complex2.cs b/src/tests/JIT/Directed/Arrays/complex2.cs index be7bb82adc72de..ae471139eb79cf 100644 --- a/src/tests/JIT/Directed/Arrays/complex2.cs +++ b/src/tests/JIT/Directed/Arrays/complex2.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct Yak { public Int32 a; @@ -16,13 +17,14 @@ public void Do_Something() } -internal class Complex2_Array_Test +public class Complex2_Array_Test { public static void test(Yak[,,,,,,] Odd_Variable) { Console.Write(Odd_Variable.Length); } - public static int Main() + [Fact] + public static int TestEntryPoint() { Console.WriteLine("Starting..."); int SIZE = 2; diff --git a/src/tests/JIT/Directed/Arrays/nintindexoutofrange.cs b/src/tests/JIT/Directed/Arrays/nintindexoutofrange.cs index bbfe3b0eda59d5..c4d90132af9e1c 100644 --- a/src/tests/JIT/Directed/Arrays/nintindexoutofrange.cs +++ b/src/tests/JIT/Directed/Arrays/nintindexoutofrange.cs @@ -3,8 +3,9 @@ // using System; using System.Runtime.CompilerServices; +using Xunit; -class NintIndexOutOfRangeTest +public class NintIndexOutOfRangeTest { [MethodImpl(MethodImplOptions.NoInlining)] static void Stelem_Ref(object[] arr, nint i, Object value) @@ -20,7 +21,8 @@ static void LdElemA(object[] arr, nint i) LdElemATestHelper(ref arr[i]); } - public static unsafe int Main() + [Fact] + public static unsafe int TestEntryPoint() { long longIndex = ((long)1) << 32; nint index = (nint)longIndex; diff --git a/src/tests/JIT/Directed/Arrays/nintindexoutofrange.csproj b/src/tests/JIT/Directed/Arrays/nintindexoutofrange.csproj index 78d2d2e26fe19c..9f04295a11af1a 100644 --- a/src/tests/JIT/Directed/Arrays/nintindexoutofrange.csproj +++ b/src/tests/JIT/Directed/Arrays/nintindexoutofrange.csproj @@ -1,6 +1,5 @@ - Exe 0 diff --git a/src/tests/JIT/Directed/Arrays/simple1.cs b/src/tests/JIT/Directed/Arrays/simple1.cs index 973f557883f464..23dc05ce1646fb 100644 --- a/src/tests/JIT/Directed/Arrays/simple1.cs +++ b/src/tests/JIT/Directed/Arrays/simple1.cs @@ -3,12 +3,14 @@ // using System; -public +using Xunit; + // Do a simple 5 dimensional Jagged array. -class Simple_Array_Test +public class Simple_Array_Test { - public static int Main() + [Fact] + public static int TestEntryPoint() { Console.WriteLine("Starting..."); int SIZE = 10; diff --git a/src/tests/JIT/Directed/Arrays/simple2.cs b/src/tests/JIT/Directed/Arrays/simple2.cs index 6143f0fefaee9e..5f215bf2ddaf36 100644 --- a/src/tests/JIT/Directed/Arrays/simple2.cs +++ b/src/tests/JIT/Directed/Arrays/simple2.cs @@ -3,10 +3,12 @@ // using System; +using Xunit; -internal class Simple2_Array_Test +public class Simple2_Array_Test { - public static int Main() + [Fact] + public static int TestEntryPoint() { Console.WriteLine("Starting..."); int SIZE = 10; diff --git a/src/tests/JIT/Directed/BitTest/BitTest.cs b/src/tests/JIT/Directed/BitTest/BitTest.cs index 7032d58d21606a..fc6fcb587c0f89 100644 --- a/src/tests/JIT/Directed/BitTest/BitTest.cs +++ b/src/tests/JIT/Directed/BitTest/BitTest.cs @@ -4,8 +4,9 @@ using System; using System.Runtime.CompilerServices; +using Xunit; -class Program +public class Program { [MethodImpl(MethodImplOptions.NoInlining)] static bool I1_BT_reg_reg(sbyte x, int y) => (x & (1 << y)) != 0; @@ -37,7 +38,8 @@ class Program [MethodImpl(MethodImplOptions.NoInlining)] static bool I8_BT_mem_reg(ref long x, int y) => (x & (1L << y)) != 0; - static int Main() + [Fact] + public static int TestEntryPoint() { sbyte i1min = sbyte.MinValue; sbyte i1one = 1; diff --git a/src/tests/JIT/Directed/BitTest/BitTest.csproj b/src/tests/JIT/Directed/BitTest/BitTest.csproj index 5d8fe225297649..377bf381b5286a 100644 --- a/src/tests/JIT/Directed/BitTest/BitTest.csproj +++ b/src/tests/JIT/Directed/BitTest/BitTest.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.cs index 6c7dcad73d7f02..6ab1e984f7d826 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(3); new DerivedClass(8); diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj index 959088b8b98fd8..a2a83758312e12 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.cs index 83ee8123e89265..dd7e97f17c1733 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass("NotNull"); new DerivedClass(null); diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj index 359497ed1a7dfb..6a3bfbcc32fcc8 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.cs index 75b364c010523c..d9c9f7ab700b2b 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(7); return 100; diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj index 2b6bcca24d0ba3..a96a30cdb04bf2 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.cs index e3815c0ae90766..eae7350d05d8a4 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(7); return 100; diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj index 04795c41f06be5..955b40c2641170 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.cs index 89b5d0e5ec1f5a..ca76d19617ad59 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(); new DerivedClass(); diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj index 78b665067e0917..e1be49cba5fb25 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.cs index beb90471ec6f16..a883dc9b7a7ce7 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(3); new DerivedClass(8); diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj index 7dff9a8d822660..046b3072713ed0 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.cs index f23fe7ccb1695f..315d62f9cd8de0 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass("NotNull"); new DerivedClass(null); diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj index b80d2c64fd2f83..d930d15c2aa95f 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.cs index 4fe5996d4b5bfb..aa2a7b9734256d 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(7); return 100; diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj index 513ca0593376b1..6fa2528ad6d21d 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.cs index 15321544d7e6ef..31767923b18f46 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(7); return 100; diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj index 769ecc3abed1e1..96e5e16657386f 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.cs index 9f4cc5318734cc..c3dea573bfa6ec 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(); new DerivedClass(); diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj index 4af79c9a7c6a1a..30de2ab797e969 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.cs b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.cs index 2a03d1e85763ee..0e065ddc8670b8 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(3); new DerivedClass(8); diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj index 3ab33a5c8e245a..4d6c3e1964c370 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.cs b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.cs index aff5f4d37d3028..90b85f2ea430bb 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass("NotNull"); new DerivedClass(null); diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj index e0871a5fdd7578..3e84006487986e 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.cs b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.cs index db5a58b02fe6c2..7b1335f09cd7f1 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(7); return 100; diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj index 5a3b0a48d52eef..42d3543841dcfc 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.cs b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.cs index bd154a365e89e4..6d9a23a88b3cfa 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(7); return 100; diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj index eb87fa4a75fea0..43c2a1c7e586fa 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.cs b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.cs index c8ad7a2c110ed1..09d7c487a8a838 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(3); new DerivedClass(8); diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj index e4c325ae19c37f..a6c4a64b3cf889 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.cs b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.cs index b439c477c0cf90..1b7c8f1783fd0e 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass("NotNull"); new DerivedClass(null); diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj index 958b27fff6846c..a120052391aafc 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.cs b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.cs index c8147b555a1e44..841bcfa3b427e3 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(7); return 100; diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj index ee7187b5f36044..6bcd5ee907c5a7 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.cs b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.cs index 881583cad3cad4..f0e3db400a5542 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.cs +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.cs @@ -11,12 +11,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Test { - static class App + public static class App { - static int Main() + [Fact] + public static int TestEntryPoint() { new DerivedClass(7); return 100; diff --git a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj index c6718027bb18d4..6fc22dfd63de32 100644 --- a/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj +++ b/src/tests/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/ConstantFolding/HandlesInAddrModes.il b/src/tests/JIT/Directed/ConstantFolding/HandlesInAddrModes.il index 17c1d4c8ae30ed..87de6c8976e2b3 100644 --- a/src/tests/JIT/Directed/ConstantFolding/HandlesInAddrModes.il +++ b/src/tests/JIT/Directed/ConstantFolding/HandlesInAddrModes.il @@ -2,12 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly HandlesInAddrModes { } -.assembly extern System.Runtime { } +.assembly extern xunit.core {} +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } -.class HandlesInAddrModes +.class public HandlesInAddrModes { .method public static int32 Main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint ldc.i4 0 diff --git a/src/tests/JIT/Directed/ConstantFolding/HandlesInAddrModes.ilproj b/src/tests/JIT/Directed/ConstantFolding/HandlesInAddrModes.ilproj index bcaa593ba81136..0d771280a81bb9 100644 --- a/src/tests/JIT/Directed/ConstantFolding/HandlesInAddrModes.ilproj +++ b/src/tests/JIT/Directed/ConstantFolding/HandlesInAddrModes.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/ConstantFolding/folding_extends_int32_on_64_bit_hosts.cs b/src/tests/JIT/Directed/ConstantFolding/folding_extends_int32_on_64_bit_hosts.cs index 87b1c545383382..ea45f7237e0f12 100644 --- a/src/tests/JIT/Directed/ConstantFolding/folding_extends_int32_on_64_bit_hosts.cs +++ b/src/tests/JIT/Directed/ConstantFolding/folding_extends_int32_on_64_bit_hosts.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Xunit; public class FoldingExtendsInt32On64BitHostsTest { // On 64 bit hosts, 32 bit constants are stored as 64 bit signed values. @@ -8,7 +9,8 @@ public class FoldingExtendsInt32On64BitHostsTest // the host was 64 bit and the target - 32 bit. Thus local assertion prop // got the "poisoned" value, which lead to silent bad codegen. - public static int Main() + [Fact] + public static int TestEntryPoint() { var r1 = 31; // "Poisoned" value. diff --git a/src/tests/JIT/Directed/ConstantFolding/folding_extends_int32_on_64_bit_hosts.csproj b/src/tests/JIT/Directed/ConstantFolding/folding_extends_int32_on_64_bit_hosts.csproj index edc51be9ca25b2..a09146632664bc 100644 --- a/src/tests/JIT/Directed/ConstantFolding/folding_extends_int32_on_64_bit_hosts.csproj +++ b/src/tests/JIT/Directed/ConstantFolding/folding_extends_int32_on_64_bit_hosts.csproj @@ -1,6 +1,5 @@ - Exe True None diff --git a/src/tests/JIT/Directed/ConstantFolding/value_numbering_checked_arithmetic_with_constants_ro.csproj b/src/tests/JIT/Directed/ConstantFolding/value_numbering_checked_arithmetic_with_constants_ro.csproj index d0b312fa28d682..188e27ffb8e1a9 100644 --- a/src/tests/JIT/Directed/ConstantFolding/value_numbering_checked_arithmetic_with_constants_ro.csproj +++ b/src/tests/JIT/Directed/ConstantFolding/value_numbering_checked_arithmetic_with_constants_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 True None diff --git a/src/tests/JIT/Directed/ConstantFolding/value_numbering_checked_integer_arithmetic_with_constants.cs b/src/tests/JIT/Directed/ConstantFolding/value_numbering_checked_integer_arithmetic_with_constants.cs index 52f98839e8d7cd..7073b77f48c708 100644 --- a/src/tests/JIT/Directed/ConstantFolding/value_numbering_checked_integer_arithmetic_with_constants.cs +++ b/src/tests/JIT/Directed/ConstantFolding/value_numbering_checked_integer_arithmetic_with_constants.cs @@ -3,13 +3,15 @@ using System; using System.Runtime.CompilerServices; +using Xunit; public class ValueNumberingCheckedIntegerArithmeticWithConstants { private static int _global = 0; private static int _counter = 100; - public static int Main() + [Fact] + public static int TestEntryPoint() { RuntimeHelpers.RunClassConstructor(typeof(ValueNumberingCheckedIntegerArithmeticWithConstants).TypeHandle); TestInt32(); diff --git a/src/tests/JIT/Directed/ConstantFolding/value_numbering_unordered_comparisons_of_constants.cs b/src/tests/JIT/Directed/ConstantFolding/value_numbering_unordered_comparisons_of_constants.cs index f5baa6e657a86e..b6ebd0ea1d9d26 100644 --- a/src/tests/JIT/Directed/ConstantFolding/value_numbering_unordered_comparisons_of_constants.cs +++ b/src/tests/JIT/Directed/ConstantFolding/value_numbering_unordered_comparisons_of_constants.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; public class ValueNumberingUnorderedComparisonsOfConstants { @@ -11,7 +12,8 @@ public class ValueNumberingUnorderedComparisonsOfConstants private static int _counter = 100; - public static int Main() + [Fact] + public static int TestEntryPoint() { // The conditions of the loops get reversed and duplicated. // As part of this a comparison like a > b, which is really !IsNaN(a) && !IsNaN(b) && a > b diff --git a/src/tests/JIT/Directed/ConstantFolding/value_numbering_unordered_comparisons_of_constants_ro.csproj b/src/tests/JIT/Directed/ConstantFolding/value_numbering_unordered_comparisons_of_constants_ro.csproj index 8cce6c7e514c02..944d8869a9fca7 100644 --- a/src/tests/JIT/Directed/ConstantFolding/value_numbering_unordered_comparisons_of_constants_ro.csproj +++ b/src/tests/JIT/Directed/ConstantFolding/value_numbering_unordered_comparisons_of_constants_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Convert/FPZero.cs b/src/tests/JIT/Directed/Convert/FPZero.cs index b7d9b10ca6b353..eb4e64bd9b0904 100644 --- a/src/tests/JIT/Directed/Convert/FPZero.cs +++ b/src/tests/JIT/Directed/Convert/FPZero.cs @@ -13,10 +13,12 @@ */ using System; +using Xunit; public class MyClass { - public static int Main() + [Fact] + public static int TestEntryPoint() { double d1 = -0e0; if (!IsNegativeZero(d1)) return 101; diff --git a/src/tests/JIT/Directed/Convert/FPZero.csproj b/src/tests/JIT/Directed/Convert/FPZero.csproj index a01486d00ba37c..4591cd0171c3a5 100644 --- a/src/tests/JIT/Directed/Convert/FPZero.csproj +++ b/src/tests/JIT/Directed/Convert/FPZero.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Convert/implicitConv.il b/src/tests/JIT/Directed/Convert/implicitConv.il index 2b1476d73fb8c4..0851ad430274a9 100644 --- a/src/tests/JIT/Directed/Convert/implicitConv.il +++ b/src/tests/JIT/Directed/Convert/implicitConv.il @@ -11,7 +11,7 @@ .assembly 'implicitConv' {} .assembly extern mscorlib{auto} -.class ILGEN_0xc60e022c { +.class public ILGEN_0xc60e022c { .method static int16 Method_0xf7bb2d95() { .zeroinit @@ -22,7 +22,7 @@ conv.i4 ret } -.method static int32 Main() { +.method public static int32 Main() { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) diff --git a/src/tests/JIT/Directed/Convert/implicitConv.ilproj b/src/tests/JIT/Directed/Convert/implicitConv.ilproj index 70b4d1853419cd..28cc0cda16f0a3 100644 --- a/src/tests/JIT/Directed/Convert/implicitConv.ilproj +++ b/src/tests/JIT/Directed/Convert/implicitConv.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Convert/ldind_conv.il b/src/tests/JIT/Directed/Convert/ldind_conv.il index 574aa4407fab22..33304105684cfd 100644 --- a/src/tests/JIT/Directed/Convert/ldind_conv.il +++ b/src/tests/JIT/Directed/Convert/ldind_conv.il @@ -5,11 +5,11 @@ .assembly extern mscorlib { auto } .assembly extern xunit.core {} .assembly extern System.Console { auto } -.assembly extern System.Runtime { auto } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'ldind_conv' { } -.class auto Program extends [System.Runtime]System.Object +.class public auto Program extends [System.Runtime]System.Object { .method private static void print(class [System.Runtime]System.String) cil managed { @@ -19,7 +19,7 @@ ret } - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/Convert/ldind_conv.ilproj b/src/tests/JIT/Directed/Convert/ldind_conv.ilproj index e7c67cc80e8533..4b3a54c1abb8a4 100644 --- a/src/tests/JIT/Directed/Convert/ldind_conv.ilproj +++ b/src/tests/JIT/Directed/Convert/ldind_conv.ilproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/Convert/minopts_convu1.il b/src/tests/JIT/Directed/Convert/minopts_convu1.il index 97162313dd030d..2bdf9fcfb01aa8 100644 --- a/src/tests/JIT/Directed/Convert/minopts_convu1.il +++ b/src/tests/JIT/Directed/Convert/minopts_convu1.il @@ -11,7 +11,7 @@ .assembly 'minopts_convu1' {} .assembly extern mscorlib{auto} -.class ILGEN_0xb0847955 { +.class public ILGEN_0xb0847955 { .method static unsigned int8 Method_0xbf6432ff() { @@ -24,7 +24,7 @@ //If the conversion fails, we get a non 100 (Failing) return code. } -.method static int32 Main() { +.method public static int32 Main() { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) diff --git a/src/tests/JIT/Directed/Convert/minopts_convu1.ilproj b/src/tests/JIT/Directed/Convert/minopts_convu1.ilproj index 676d8a4c1a5263..82d04dd1a47ea3 100644 --- a/src/tests/JIT/Directed/Convert/minopts_convu1.ilproj +++ b/src/tests/JIT/Directed/Convert/minopts_convu1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Convert/out_of_range_fp_to_int_conversions.cs b/src/tests/JIT/Directed/Convert/out_of_range_fp_to_int_conversions.cs index 954fda640816cd..5b78783c09e4ca 100644 --- a/src/tests/JIT/Directed/Convert/out_of_range_fp_to_int_conversions.cs +++ b/src/tests/JIT/Directed/Convert/out_of_range_fp_to_int_conversions.cs @@ -9,6 +9,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Numerics; +using Xunit; namespace FPBehaviorApp { @@ -259,7 +260,7 @@ public static Vector ConvertToVectorUInt64(Vector vFloat, FPtoInt } } - class Program + public class Program { static int failures = 0; static FPtoIntegerConversionType ManagedConversionRule = FPtoIntegerConversionType.CONVERT_MANAGED_BACKWARD_COMPATIBLE_X86_X64; @@ -371,7 +372,8 @@ static void TestBitValue(uint value, double? dblValNullable = null, FPtoIntegerC } } - static int Main(string[] args) + [Fact] + public static int TestEntryPoint() { switch (RuntimeInformation.ProcessArchitecture) { @@ -389,14 +391,6 @@ static int Main(string[] args) break; } Console.WriteLine($"Expected managed float behavior is {Program.ManagedConversionRule} Execute with parameter to adjust"); - if (args.Length > 0) - { - if (!Enum.TryParse(args[0], out ManagedConversionRule)) - { - Console.WriteLine($"Unable to parse {args[0]}"); - return 1; - } - } Console.WriteLine("Specific test cases"); TestBitValue(0, 9223372036854777856.0); diff --git a/src/tests/JIT/Directed/Convert/out_of_range_fp_to_int_conversions.csproj b/src/tests/JIT/Directed/Convert/out_of_range_fp_to_int_conversions.csproj index 4fdc04dc7e690f..15e584299a6a7a 100644 --- a/src/tests/JIT/Directed/Convert/out_of_range_fp_to_int_conversions.csproj +++ b/src/tests/JIT/Directed/Convert/out_of_range_fp_to_int_conversions.csproj @@ -1,6 +1,7 @@ - Exe + + true True true diff --git a/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il b/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il index 9b4ce90ddb9a62..72ec4ce2456455 100644 --- a/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il +++ b/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il @@ -3,10 +3,10 @@ .assembly extern System.Console { auto } .assembly extern xunit.core {} -.assembly extern System.Runtime { auto } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'signed_overflow_conversions_are_not_treated_as_unsigned' { } -.class auto SignedOverflowConversionsAreNotTreatedAsUnsigned extends [System.Runtime]System.Object +.class public auto SignedOverflowConversionsAreNotTreatedAsUnsigned extends [System.Runtime]System.Object { .method private static void Print(class [System.Runtime]System.String) cil managed { @@ -15,7 +15,7 @@ ret } - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.ilproj b/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.ilproj index a6b9c395621335..324e723653c834 100644 --- a/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.ilproj +++ b/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Directed/Convert/value_numbering_checked_casts_of_constants.cs b/src/tests/JIT/Directed/Convert/value_numbering_checked_casts_of_constants.cs index db5edfc2dd0807..6b3c310a24ce8e 100644 --- a/src/tests/JIT/Directed/Convert/value_numbering_checked_casts_of_constants.cs +++ b/src/tests/JIT/Directed/Convert/value_numbering_checked_casts_of_constants.cs @@ -3,13 +3,15 @@ using System; using System.Runtime.CompilerServices; +using Xunit; public partial class ValueNumberingCheckedCastsOfConstants { private static int _global = 0; private static int _counter = 100; - public static int Main() + [Fact] + public static int TestEntryPoint() { TestCastingSingleToSByte(); TestCastingSingleToByte(); diff --git a/src/tests/JIT/Directed/Convert/value_numbering_checked_casts_of_constants.csproj b/src/tests/JIT/Directed/Convert/value_numbering_checked_casts_of_constants.csproj index 75129bf3386fce..1b47316d94e533 100644 --- a/src/tests/JIT/Directed/Convert/value_numbering_checked_casts_of_constants.csproj +++ b/src/tests/JIT/Directed/Convert/value_numbering_checked_casts_of_constants.csproj @@ -1,6 +1,5 @@ - Exe 1 True None diff --git a/src/tests/JIT/Directed/Directed_cs_r.csproj b/src/tests/JIT/Directed/Directed_cs_r.csproj new file mode 100644 index 00000000000000..887d06612b9971 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_cs_r.csproj @@ -0,0 +1,10 @@ + + + true + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directed_cs_ro.csproj b/src/tests/JIT/Directed/Directed_cs_ro.csproj new file mode 100644 index 00000000000000..191c2d9cbc76b4 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_cs_ro.csproj @@ -0,0 +1,10 @@ + + + true + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directed_d.csproj b/src/tests/JIT/Directed/Directed_d.csproj new file mode 100644 index 00000000000000..5f370a54b73a92 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_d.csproj @@ -0,0 +1,10 @@ + + + true + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directed_do.csproj b/src/tests/JIT/Directed/Directed_do.csproj new file mode 100644 index 00000000000000..6aae1c6e4d5dd8 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_do.csproj @@ -0,0 +1,10 @@ + + + true + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directed_others_group1.csproj b/src/tests/JIT/Directed/Directed_others_group1.csproj new file mode 100644 index 00000000000000..a65d4f9a3bbc34 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_others_group1.csproj @@ -0,0 +1,17 @@ + + + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directed_others_group2.csproj b/src/tests/JIT/Directed/Directed_others_group2.csproj new file mode 100644 index 00000000000000..2724d993018586 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_others_group2.csproj @@ -0,0 +1,16 @@ + + + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directed_r.csproj b/src/tests/JIT/Directed/Directed_r.csproj new file mode 100644 index 00000000000000..11e067a062ac01 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_r.csproj @@ -0,0 +1,11 @@ + + + true + + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directed_ro.csproj b/src/tests/JIT/Directed/Directed_ro.csproj new file mode 100644 index 00000000000000..4ac1311eede69d --- /dev/null +++ b/src/tests/JIT/Directed/Directed_ro.csproj @@ -0,0 +1,11 @@ + + + true + + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directory.Build.props b/src/tests/JIT/Directed/Directory.Build.props new file mode 100644 index 00000000000000..118a6455c09b8b --- /dev/null +++ b/src/tests/JIT/Directed/Directory.Build.props @@ -0,0 +1,11 @@ + + + + + false + + $(MSBuildProjectName.Replace('_il_d', '').Replace('_il_r', '')) + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.il b/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.il index d3d9e18e759b58..458ea4b72fb10f 100644 --- a/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.il +++ b/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.il @@ -15,7 +15,7 @@ .namespace DD { - .class auto ansi ZZ + .class public auto ansi ZZ { .method public static int32 Main() il managed { diff --git a/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj b/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj index bcaa593ba81136..0d771280a81bb9 100644 --- a/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj +++ b/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/ExcepFilters/fault/fault.il b/src/tests/JIT/Directed/ExcepFilters/fault/fault.il index 3263e6695605f0..555332e0b3da1f 100644 --- a/src/tests/JIT/Directed/ExcepFilters/fault/fault.il +++ b/src/tests/JIT/Directed/ExcepFilters/fault/fault.il @@ -13,7 +13,7 @@ } .namespace DD { - .class auto ansi ZZ + .class public auto ansi ZZ { .method public static int32 Main() il managed { diff --git a/src/tests/JIT/Directed/ExcepFilters/fault/fault.ilproj b/src/tests/JIT/Directed/ExcepFilters/fault/fault.ilproj index bcaa593ba81136..0d771280a81bb9 100644 --- a/src/tests/JIT/Directed/ExcepFilters/fault/fault.ilproj +++ b/src/tests/JIT/Directed/ExcepFilters/fault/fault.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/ExcepFilters/mixed/mixed.il b/src/tests/JIT/Directed/ExcepFilters/mixed/mixed.il index 34e58fb0da784e..a994f6cc2b2984 100644 --- a/src/tests/JIT/Directed/ExcepFilters/mixed/mixed.il +++ b/src/tests/JIT/Directed/ExcepFilters/mixed/mixed.il @@ -48,7 +48,7 @@ } // end of class 'CustomException' - .class auto ansi ZZ + .class public auto ansi ZZ { .method public static int32 Main() il managed { diff --git a/src/tests/JIT/Directed/ExcepFilters/mixed/mixed.ilproj b/src/tests/JIT/Directed/ExcepFilters/mixed/mixed.ilproj index 972c31a9a80dd0..7c7ed9f1abff72 100644 --- a/src/tests/JIT/Directed/ExcepFilters/mixed/mixed.ilproj +++ b/src/tests/JIT/Directed/ExcepFilters/mixed/mixed.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/ExcepFilters/mixed3/mixed3.il b/src/tests/JIT/Directed/ExcepFilters/mixed3/mixed3.il index 35e1e802e651a6..8fd65dd0e64b74 100644 --- a/src/tests/JIT/Directed/ExcepFilters/mixed3/mixed3.il +++ b/src/tests/JIT/Directed/ExcepFilters/mixed3/mixed3.il @@ -15,7 +15,7 @@ } .namespace DD { - .class auto ansi ZZ + .class public auto ansi ZZ { .field public static int32 exitcode .method public static int32 Main() il managed diff --git a/src/tests/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj b/src/tests/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj index 2969b18f1d9cbe..da350f6a897c8d 100644 --- a/src/tests/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj +++ b/src/tests/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il b/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il index 99eb6832910904..f57f6713ee837a 100644 --- a/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il +++ b/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il @@ -14,7 +14,7 @@ //------------------------------------------------------ // This test ensures that fault handlers are called in // the correct order. -.class TEST +.class public TEST { .field public static int32 result diff --git a/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj b/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj index 972c31a9a80dd0..7c7ed9f1abff72 100644 --- a/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj +++ b/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il b/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il index 816dae2effc37d..7eb156d566fbc0 100644 --- a/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il +++ b/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il @@ -22,7 +22,7 @@ } } -.class TEST +.class public TEST { .method public static int32 Main() il managed { diff --git a/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj b/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj index 972c31a9a80dd0..7c7ed9f1abff72 100644 --- a/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj +++ b/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/FaultHandlers/Simple/Simple.ilproj b/src/tests/JIT/Directed/FaultHandlers/Simple/Simple_.ilproj similarity index 89% rename from src/tests/JIT/Directed/FaultHandlers/Simple/Simple.ilproj rename to src/tests/JIT/Directed/FaultHandlers/Simple/Simple_.ilproj index 042bf2d4b981b2..dfa53c50eba698 100644 --- a/src/tests/JIT/Directed/FaultHandlers/Simple/Simple.ilproj +++ b/src/tests/JIT/Directed/FaultHandlers/Simple/Simple_.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/FaultHandlers/Simple/simple.il b/src/tests/JIT/Directed/FaultHandlers/Simple/simple.il index c2da6c5e693a5a..d6461302a560d9 100644 --- a/src/tests/JIT/Directed/FaultHandlers/Simple/simple.il +++ b/src/tests/JIT/Directed/FaultHandlers/Simple/simple.il @@ -8,14 +8,14 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly simple +.assembly 'Simple_' { } //------------------------------------------------------ // This test ensures that fault handlers are called // when exception raised. -.class TEST +.class public TEST { .field public static int32 result diff --git a/src/tests/JIT/Directed/IL/PInvokeTail/PInvokeTail.il b/src/tests/JIT/Directed/IL/PInvokeTail/PInvokeTail.il index 4bae8769b81da0..75d1bdfc918f82 100644 --- a/src/tests/JIT/Directed/IL/PInvokeTail/PInvokeTail.il +++ b/src/tests/JIT/Directed/IL/PInvokeTail/PInvokeTail.il @@ -6,9 +6,10 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly pinvoketail +.assembly 'PInvokeTail' { } @@ -50,6 +51,9 @@ .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 4 .locals init (char& pinned) diff --git a/src/tests/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj b/src/tests/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj index cbbdb9678024c4..54cd350fbaeac6 100644 --- a/src/tests/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj +++ b/src/tests/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj @@ -1,6 +1,7 @@ - Exe + + true true 1 diff --git a/src/tests/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj b/src/tests/JIT/Directed/IL/PInvokeTail/TailWinApi_.ilproj similarity index 78% rename from src/tests/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj rename to src/tests/JIT/Directed/IL/PInvokeTail/TailWinApi_.ilproj index fc2c768287e272..bf382226d695f6 100644 --- a/src/tests/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj +++ b/src/tests/JIT/Directed/IL/PInvokeTail/TailWinApi_.ilproj @@ -1,6 +1,7 @@ - Exe + + true true diff --git a/src/tests/JIT/Directed/IL/PInvokeTail/tailwinapi.il b/src/tests/JIT/Directed/IL/PInvokeTail/tailwinapi.il index 603fc1a8e34d05..4e57c624783c6f 100644 --- a/src/tests/JIT/Directed/IL/PInvokeTail/tailwinapi.il +++ b/src/tests/JIT/Directed/IL/PInvokeTail/tailwinapi.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly tailwinapi +.assembly 'TailWinApi_' { } @@ -99,6 +100,9 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint // Method begins at RVA 0x10c0 // Code size 241 (0xf1) diff --git a/src/tests/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO.il b/src/tests/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO.il index c645cb7b1de126..f35b8706508a3f 100644 --- a/src/tests/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO.il +++ b/src/tests/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO.il @@ -1,20 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -.assembly extern System.Runtime -{ - .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:2:1:0 -} +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern xunit.core {} .assembly ExplicitTailCallNoSO { } -.class private abstract auto ansi sealed beforefieldinit ExplicitTailCallNoSO +.class public abstract auto ansi sealed beforefieldinit ExplicitTailCallNoSO extends [System.Runtime]System.Object { - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO.ilproj b/src/tests/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO.ilproj index 433ae2d8efb7f9..d48c3bde42a01c 100644 --- a/src/tests/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO.ilproj +++ b/src/tests/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO.ilproj @@ -1,6 +1,7 @@ - Exe + + true PdbOnly diff --git a/src/tests/JIT/Directed/IL/Tailcall/JitTailcall1.il b/src/tests/JIT/Directed/IL/Tailcall/JitTailcall1.il index b229bce6798c14..1ce95849a50c27 100644 --- a/src/tests/JIT/Directed/IL/Tailcall/JitTailcall1.il +++ b/src/tests/JIT/Directed/IL/Tailcall/JitTailcall1.il @@ -2,15 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly jittailcall1 +.assembly 'jitTailcall1_' { } -.class EvenOdd +.class public EvenOdd { .method static bool IsEven(int32 N) { .maxstack 2 ldarg.0 // N @@ -63,6 +64,9 @@ LoadOdd: .method public static int32 main() { .entrypoint + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .maxstack 1 ldc.i4.5 call void EvenOdd::Test(int32) diff --git a/src/tests/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj b/src/tests/JIT/Directed/IL/Tailcall/JitTailcall2_.ilproj similarity index 76% rename from src/tests/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj rename to src/tests/JIT/Directed/IL/Tailcall/JitTailcall2_.ilproj index af932cbed491c5..f33a6eb678269f 100644 --- a/src/tests/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj +++ b/src/tests/JIT/Directed/IL/Tailcall/JitTailcall2_.ilproj @@ -1,6 +1,7 @@ - Exe + + true PdbOnly diff --git a/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il b/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il index 57fcd448e92bdf..89cf868b14881a 100644 --- a/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il +++ b/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il @@ -10,14 +10,14 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'Jittailcall2'// as "aaa" +.assembly 'JitTailcall2_'// as "aaa" { } .namespace DefaultNamespace { - .class auto ansi dotailcall extends [mscorlib]System.Object + .class public auto ansi dotailcall extends [mscorlib]System.Object { .field private static int32 ifoo .field private static int32 iboo diff --git a/src/tests/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj b/src/tests/JIT/Directed/IL/Tailcall/jitTailcall1_.ilproj similarity index 75% rename from src/tests/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj rename to src/tests/JIT/Directed/IL/Tailcall/jitTailcall1_.ilproj index bdbb31f28da8ad..0c50cbaad4b837 100644 --- a/src/tests/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj +++ b/src/tests/JIT/Directed/IL/Tailcall/jitTailcall1_.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/IL/leave/leave1.ilproj b/src/tests/JIT/Directed/IL/leave/leave1.ilproj index 84e8423fbd0b2d..237d3d3d278838 100644 --- a/src/tests/JIT/Directed/IL/leave/leave1.ilproj +++ b/src/tests/JIT/Directed/IL/leave/leave1.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/IL/leave/leave2.il b/src/tests/JIT/Directed/IL/leave/leave2.il index 4a0d81e672ebc9..e1a54e2e6686a5 100644 --- a/src/tests/JIT/Directed/IL/leave/leave2.il +++ b/src/tests/JIT/Directed/IL/leave/leave2.il @@ -1,14 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. - .module 'rethrow.exe' .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'rethrow'// as "rethrow" +.assembly 'leave1' { @@ -55,7 +55,7 @@ .size 40 } // end of class '$MultiByte$40' -.class value explicit ansi sealed $MultiByte$28 +.class public value explicit ansi sealed $MultiByte$28 { .pack 1 .size 28 @@ -133,9 +133,12 @@ ldstr "In Catch" IL_005b: ret } // end of global method 'test' -.method public static int32 - main() il managed +.class public auto ansi leave1 { +.method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .vtentry 1 : 1 .entrypoint // Code size 110 (0x6e) @@ -195,4 +198,4 @@ ldstr "!!! HMM...." IL_006c: ldc.i4.0 IL_006d: ret } // end of global method 'main' - +} \ No newline at end of file diff --git a/src/tests/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.il b/src/tests/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.il index e16180a1c2cf6f..9cd16a641da2e8 100644 --- a/src/tests/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.il +++ b/src/tests/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.il @@ -6,8 +6,9 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly mutualrecurtailcall +.assembly 'MutualRecur-TailCall' { } @@ -3409,8 +3410,12 @@ IL_003d: ret } +.class public auto ansi MutualRecur_TailCall { .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 2 .locals (int32 V_0) @@ -4636,3 +4641,4 @@ IL_0e47: ldc.i4 0x64 IL_0e4c: ret } +} diff --git a/src/tests/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj b/src/tests/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj index 8502424557aa43..0d8b49e9c72fd1 100644 --- a/src/tests/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj +++ b/src/tests/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/IL/rethrow/Rethrow1.ilproj b/src/tests/JIT/Directed/IL/rethrow/Rethrow1_.ilproj similarity index 75% rename from src/tests/JIT/Directed/IL/rethrow/Rethrow1.ilproj rename to src/tests/JIT/Directed/IL/rethrow/Rethrow1_.ilproj index 2c55ebe774f249..d5387f9b97c0d1 100644 --- a/src/tests/JIT/Directed/IL/rethrow/Rethrow1.ilproj +++ b/src/tests/JIT/Directed/IL/rethrow/Rethrow1_.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/IL/rethrow/Rethrow2.ilproj b/src/tests/JIT/Directed/IL/rethrow/Rethrow2_.ilproj similarity index 75% rename from src/tests/JIT/Directed/IL/rethrow/Rethrow2.ilproj rename to src/tests/JIT/Directed/IL/rethrow/Rethrow2_.ilproj index 29892fc353dfd8..674ee3de73e443 100644 --- a/src/tests/JIT/Directed/IL/rethrow/Rethrow2.ilproj +++ b/src/tests/JIT/Directed/IL/rethrow/Rethrow2_.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/IL/rethrow/rethrow1.il b/src/tests/JIT/Directed/IL/rethrow/rethrow1.il index 4c428ac7884b83..af0aeed3442fd6 100644 --- a/src/tests/JIT/Directed/IL/rethrow/rethrow1.il +++ b/src/tests/JIT/Directed/IL/rethrow/rethrow1.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly rethrow1 +.assembly 'Rethrow1_' { } @@ -75,8 +76,12 @@ // Exception count 1 } // end of global method '?test@@YAHXZ' +.class public auto ansi rethrow1 { .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) // Method begins at RVA 0x10a0 // Code size 145 (0x91) .entrypoint @@ -140,3 +145,4 @@ IL_0090: ret // Exception count 1 } // end of global method 'main' +} diff --git a/src/tests/JIT/Directed/IL/rethrow/rethrow2.il b/src/tests/JIT/Directed/IL/rethrow/rethrow2.il index 39067167cff203..de38263d602d2b 100644 --- a/src/tests/JIT/Directed/IL/rethrow/rethrow2.il +++ b/src/tests/JIT/Directed/IL/rethrow/rethrow2.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly rethrow2 +.assembly 'Rethrow2_' { } @@ -76,8 +77,12 @@ // Exception count 1 } // end of global method '?test@@YAHXZ' +.class public auto ansi rethrow2 { .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) // Method begins at RVA 0x10a0 // Code size 145 (0x91) .entrypoint @@ -141,4 +146,5 @@ IL_0090: ret // Exception count 1 } // end of global method 'main' +} diff --git a/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.cs b/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.cs index 6ff72bc01a9ce4..f699d9ec142786 100644 --- a/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.cs +++ b/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.Runtime.CompilerServices; +using Xunit; public class TestClass_Loops { public struct S1 @@ -134,7 +135,8 @@ public void Method0() return; } } - public static int Main() + [Fact] + public static int TestEntryPoint() { new TestClass_Loops().Method0(); return 100; diff --git a/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.csproj b/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.csproj index 41982afaf9353d..3b4963e22a3b6a 100644 --- a/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.csproj +++ b/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 diff --git a/src/tests/JIT/Directed/Misc/Concat/ConcatTest.cs b/src/tests/JIT/Directed/Misc/Concat/ConcatTest.cs index 28e3f9b0019b25..9b572b075b8ca3 100644 --- a/src/tests/JIT/Directed/Misc/Concat/ConcatTest.cs +++ b/src/tests/JIT/Directed/Misc/Concat/ConcatTest.cs @@ -2,8 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; -internal class ConcatTest +public class ConcatTest { static string strA = "A"; static string strB = "B"; @@ -19,7 +20,8 @@ internal class ConcatTest static int iReturn = 100; - static public int Main() + [Fact] + static public int TestEntryPoint() { iReturn = 100; try diff --git a/src/tests/JIT/Directed/Misc/Concat/ConcatTest.csproj b/src/tests/JIT/Directed/Misc/Concat/ConcatTest.csproj index 4075ae90a4d1c7..35b03986da6470 100644 --- a/src/tests/JIT/Directed/Misc/Concat/ConcatTest.csproj +++ b/src/tests/JIT/Directed/Misc/Concat/ConcatTest.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.il b/src/tests/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.il index 752d06d9b06a97..453ed0c7160b92 100644 --- a/src/tests/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.il +++ b/src/tests/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly badregargs +.assembly 'BadRegArgs' { } // Original test by sborde modified by bwadswor -.class BadRegArgs +.class public BadRegArgs { .field public static int32 s_i .field public static class [mscorlib]System.Object s_Obj @@ -130,6 +131,9 @@ ERR_EXIT: .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 10 .locals (int32,int32,int32) diff --git a/src/tests/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj b/src/tests/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj index 4003e50eb85371..d6e3fb1f60de6d 100644 --- a/src/tests/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj +++ b/src/tests/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.il b/src/tests/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.il index c7973e333e116c..896a726ce3c3a0 100644 --- a/src/tests/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.il +++ b/src/tests/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.il @@ -2,15 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly sideeffects +.assembly 'SideEffects' { } -.class SideEffects +.class public SideEffects { .field public static int32 m_i .field public static int32 s_i @@ -228,6 +229,9 @@ ERROR_EXIT: .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 10 .locals (int32,int32,int32) diff --git a/src/tests/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj b/src/tests/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj index 9e79e7c47f50c7..757a497684ca70 100644 --- a/src/tests/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj +++ b/src/tests/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il b/src/tests/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il index fa0447a72abca8..fb024ed52703fd 100644 --- a/src/tests/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il +++ b/src/tests/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il @@ -3,10 +3,11 @@ .assembly extern System.Console { auto } +.assembly extern xunit.core {} .assembly extern System.Threading.Thread { auto } .assembly extern legacy library mscorlib { auto } -.assembly mutualthdrecurfptr +.assembly 'MutualThdRecur-fptr' { } @@ -2983,8 +2984,12 @@ call void Thread_EA::Dispatch(method explicit instance void *(int32), int32) IL_003d: ret } +.class public auto ansi MutualThdRecur_fptr { .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .maxstack 4 .entrypoint .locals (class [System.Threading.Thread]System.Threading.Thread[] thrd, @@ -3050,3 +3055,4 @@ call void Thread_EA::Dispatch(method explicit instance void *(int32), int32) IL_00a3: ldc.i4 0x64 IL_00a8: ret } +} \ No newline at end of file diff --git a/src/tests/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.ilproj b/src/tests/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.ilproj index 0294f4b6e7b2fb..91932cdf3bb883 100644 --- a/src/tests/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.ilproj +++ b/src/tests/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Directed/Misc/function_pointer/funcptrtest.il b/src/tests/JIT/Directed/Misc/function_pointer/funcptrtest.il index 4e690b43e50f15..261af2d86d47b7 100644 --- a/src/tests/JIT/Directed/Misc/function_pointer/funcptrtest.il +++ b/src/tests/JIT/Directed/Misc/function_pointer/funcptrtest.il @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) @@ -45,6 +46,9 @@ .method public static int32 main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint ldstr "Starting Test..." call void [System.Console]System.Console::WriteLine(class [mscorlib]System.String) diff --git a/src/tests/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj b/src/tests/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj index 324abf6be0f323..6647ba94cd6d7c 100644 --- a/src/tests/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj +++ b/src/tests/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix.cs b/src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix.cs index 5b8840cdc149ea..c0138ddb544eba 100644 --- a/src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix.cs +++ b/src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix.cs @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; internal class Foo { } -internal class Test_gettypetypeofmatrix +public class Test_gettypetypeofmatrix { private static object s_null = null; private static object s_object = new object(); @@ -15,7 +16,8 @@ internal class Test_gettypetypeofmatrix private static Foo s_foo = new Foo(); private static Foo[] s_fooArray = new Foo[10]; - static public int Main() + [Fact] + static public int TestEntryPoint() { int iReturn = 100; try diff --git a/src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj b/src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix_gettype.csproj similarity index 78% rename from src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj rename to src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix_gettype.csproj index bdac40ad1e45a3..9f52ab6b1eb840 100644 --- a/src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj +++ b/src/tests/JIT/Directed/Misc/gettype/gettypetypeofmatrix_gettype.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1.cs b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1.cs index 29f82fd0fe82dc..3e06a851305e7a 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1.cs +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1.cs @@ -2,10 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; namespace PrimitiveVT { - unsafe class CallConv1 + public unsafe class CallConv1 { public const int DefaultSeed = 20010415; public static int Seed = Environment.GetEnvironmentVariable("CORECLR_SEED") switch @@ -35,7 +36,8 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed, int f10(params VT1B[] args) { int sum = 0; for (int i = 0; i < args.Length; sum += args[i], i++) { }; return sum; } - static int Main() + [Fact] + public static int TestEntryPoint() { int a = rand.Next(); diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_d.csproj similarity index 92% rename from src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj rename to src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_d.csproj index f20ce9fcbaa1d0..931f7c23e83946 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_d.csproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_do.csproj similarity index 92% rename from src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj rename to src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_do.csproj index 760b39c31a7d4d..dea40e33ac75fc 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_do.csproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_r.csproj similarity index 92% rename from src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj rename to src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_r.csproj index 461df3d2eb36d2..96678ca134c6b1 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_r.csproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_ro.csproj similarity index 92% rename from src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj rename to src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_ro.csproj index 954c82f3ec78ec..acf9ac5bf3f80e 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv1_PREFIX_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2.cs b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2.cs index 85dbb4cb0f07e6..ade8bffa66e192 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2.cs +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2.cs @@ -2,10 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; namespace PrimitiveVT { - unsafe class CallConv2 + public unsafe class CallConv2 { public const int DefaultSeed = 20010415; public static int Seed = Environment.GetEnvironmentVariable("CORECLR_SEED") switch @@ -35,7 +36,8 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed, uint f10(params VT2B[] args) { uint sum = 0; for (uint i = 0; i < args.Length; sum += args[i], i++) { }; return sum; } - static int Main() + [Fact] + public static int TestEntryPoint() { uint a = (uint)rand.Next(); diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_d.csproj similarity index 92% rename from src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj rename to src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_d.csproj index e80794754bfaf2..8503b4d1797b5e 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_d.csproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_do.csproj similarity index 92% rename from src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj rename to src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_do.csproj index 7c689f59cd2bc9..dbf820322d4451 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_do.csproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_r.csproj similarity index 92% rename from src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj rename to src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_r.csproj index af07a8a4bbb8e9..ebb48ab4886a80 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_r.csproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_ro.csproj similarity index 92% rename from src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj rename to src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_ro.csproj index 8ec9cdec5f7b84..a7a7639762deaa 100644 --- a/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj +++ b/src/tests/JIT/Directed/PREFIX/PrimitiveVT/callconv2_PREFIX_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.il index 0ab8c195cbdd2f..22c778da89cbae 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly box_unbox{} +.assembly 'Box_Unbox_unaligned_1'{} //####################################### //# -- valClass -- ################################# @@ -78,7 +79,10 @@ //--------------------------# // entry point -# //--------------------------# -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 // -- initialize the val class diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox_unaligned_1.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox_unaligned_1.ilproj index 36090515c8407d..5661ca9880ac03 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.il index 4d3552d7d9b4cc..e4d54f005e573e 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.il @@ -3,17 +3,18 @@ .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'add'{ +.assembly 'add_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class explicit _add { +.class public explicit _add { .field [0] int32 global0 .field [4] int32 global1 @@ -26,7 +27,10 @@ ret //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 6 .locals init (class _add target) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add_unaligned_1.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add_unaligned_1.ilproj index 29d61f567663ad..1cc2edaa948678 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/add.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/add.il index 4d3552d7d9b4cc..481ae8e3213fa6 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/add.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/add.il @@ -3,17 +3,18 @@ .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'add'{ +.assembly 'add_PREFIX_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class explicit _add { +.class public explicit _add { .field [0] int32 global0 .field [4] int32 global1 @@ -26,7 +27,10 @@ ret //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 6 .locals init (class _add target) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/add_PREFIX_unaligned_1.ilproj similarity index 88% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/add_PREFIX_unaligned_1.ilproj index 613bfa9cc28032..5d4f6409840beb 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/add_PREFIX_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist.il index 99ddad161eb97b..cbffec7b469523 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist.il @@ -19,7 +19,8 @@ arg1==arg4, arg2==arg5, arg3==arg6. */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_32BIT_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -77,7 +78,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglist_ { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -108,3 +113,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist64.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist64.il index 74ad14baf0e67a..c0887440fa8128 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist64.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist64.il @@ -19,7 +19,8 @@ arg1==arg4, arg2==arg5, arg3==arg6. */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_64BIT_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -87,7 +88,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglist64 { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -118,3 +123,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il index 055e6f6f78fcd1..4abdaa3bde6794 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il @@ -28,7 +28,8 @@ ARM is closer to the native ABI: */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_ARM_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -88,7 +89,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglistARM { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -119,3 +124,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_32BIT.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_32BIT_unaligned_1.ilproj similarity index 84% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_32BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_32BIT_unaligned_1.ilproj index f06b170c80bf4b..234ed1f8c99c6e 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_32BIT.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_32BIT_unaligned_1.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_64BIT.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_64BIT_unaligned_1.ilproj similarity index 80% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_64BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_64BIT_unaligned_1.ilproj index 3a7d1c3e60d5f8..4aa377bfa4bd75 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_64BIT.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_64BIT_unaligned_1.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_ARM.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_ARM_unaligned_1.ilproj similarity index 84% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_ARM.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_ARM_unaligned_1.ilproj index ca3158bf90969a..5c540429673da8 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_ARM.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_ARM_unaligned_1.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests.il index ae4207e98ae4a5..65d1f9a3ff7d50 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests.il @@ -2,18 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly array_tests{} +.assembly 'array_tests_unaligned_1'{} .class value sealed valClass { .field int32 Field } -.class array_tests { +.class public array_tests { .field static int8[] i1 .field static unsigned int8[] u1 @@ -195,7 +196,10 @@ END: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (int32) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests_unaligned_1.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests_unaligned_1.ilproj index 7e6a250b1c9455..c9af748f939666 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk.il index 94308a920cebbf..f04bb734a79e15 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk.il @@ -2,19 +2,20 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'cpblk'{ +.assembly 'cpblk_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _cpblk { +.class public _cpblk { //------------------------- // Global Data - @@ -68,7 +69,10 @@ FAIL: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk_unaligned_1.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk_unaligned_1.ilproj index 8ce6bd8ab4bd28..b0e4d46a05a00c 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj.il index 47b11cbaf05e6f..99f35261127ebd 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj.il @@ -6,16 +6,20 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'cpobj'{} +.assembly 'cpobj_unaligned_1'{} .class public _cpobj { .field static value class valClass Instance1 .field static value class valClass Instance2 -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals (class [mscorlib]System.IO.TextWriter) .maxstack 2 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj_unaligned_1.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj_unaligned_1.ilproj index 8fc711dc372889..727294b29541fd 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/cpobj_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests.il index 3b5d1d8cd96e6c..3144aebd801469 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests.il @@ -2,14 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly field_tests{} +.assembly 'field_tests_unaligned_1'{} -.class field_tests { +.class public field_tests { .field int8 i1Field .field int16 i2Field @@ -107,7 +108,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (class field_tests) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests_unaligned_1.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests_unaligned_1.ilproj index 247deb1713b8fb..c680de401a6f3a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests.il index d68cf63e76e110..46449ba9ed8133 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests.il @@ -2,14 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly fielda_tests{} +.assembly 'fielda_tests_unaligned_1'{} -.class field_tests { +.class public field_tests { .field int8 i1Field .field int16 i2Field @@ -108,7 +109,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (class field_tests) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests_unaligned_1.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests_unaligned_1.ilproj index e1579dff3319e1..96e2ac4fe559a0 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.il index b3b4333f9c8da4..e7d5d713b759fe 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'initblk'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'initblk_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _initblk { +.class public _initblk { // .data DATA = int32(0x00000000) @@ -20,7 +21,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk_unaligned_1.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/initblk_unaligned_1.ilproj index 1da6a535ce437a..25dd7266068088 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.il index 859c86f0b7f0a2..4437665e33c010 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'initobj'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'initobj_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -26,6 +27,9 @@ // Entry point - Main - //------------------------- .method public static int32 main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .locals (value class valClass, int32) .maxstack 10 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj_unaligned_1.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/initobj_unaligned_1.ilproj index 7544fb3b1fb881..b1b03b850211c1 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.il index e0ba4bfbd9c229..c8310fed6e1189 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly ldind_stind{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'ldind_stind_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class ldind_stind { +.class public ldind_stind { //------------------------- // Global Data - @@ -44,7 +45,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind_unaligned_1.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind_unaligned_1.ilproj index 19cd8c05742cc8..936d1950d98145 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca.il index 1f56a8e033b411..57ebf0c33926e8 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca.il @@ -2,21 +2,25 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'ldloca'{ +.assembly 'ldloca_unaligned_1'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _ldloca { +.class public _ldloca { //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (int32,int32&) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca_unaligned_1.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca_unaligned_1.ilproj index 0da9e74569c4b0..ae5706984cea96 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj.il index 298974dfa9a733..60812eced46ea7 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj.il @@ -6,15 +6,19 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'ldobj' { +.assembly 'ldobj_unaligned_1' { } .class public _ldobj { .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals (class [mscorlib]System.IO.TextWriter,value class valClass,value class valClass) .maxstack 2 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj_unaligned_1.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj_unaligned_1.ilproj index f3cf514f67c3d7..4187891a7fb2bb 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/localloc.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/localloc.il index d7f667a19f0ac4..450290d47b2af3 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/localloc.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/localloc.il @@ -6,14 +6,15 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'localloc' { +.assembly 'localloc_unaligned_1' { } -.class _localloc { +.class public _localloc { .method void .ctor() { @@ -23,7 +24,10 @@ ret } -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .locals (class [mscorlib]System.IO.TextWriter,int32*,int32,class [mscorlib]System.Text.StringBuilder,int32,string) .entrypoint call class [mscorlib]System.IO.TextWriter [System.Console]System.Console::get_Out() diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/localloc_unaligned_1.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/localloc_unaligned_1.ilproj index 4259991549266b..ddd12ec0ef756a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/localloc_unaligned_1.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.il index bc487c31c2d10e..6c693f909282b8 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly box_unbox{} +.assembly 'Box_Unbox_unaligned_2'{} //####################################### //# -- valClass -- ################################# @@ -79,6 +80,9 @@ // entry point -# //--------------------------# .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 // -- initialize the val class diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox_unaligned_2.ilproj index 36090515c8407d..5661ca9880ac03 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/Box_Unbox_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/add.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/add.il index a6131d642f4b74..716a7e7547cd2c 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/add.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/add.il @@ -4,18 +4,19 @@ // (04/08/09) Updated the layout field values to match unaligned.0x2. Else the test fails on IA64 if explicit layouts are specified. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'add' { +.assembly 'add_PREFIX_unaligned_2' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class explicit _add { +.class public explicit _add { .field [2] int32 global0 .field [6] int32 global1 @@ -25,7 +26,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 6 .locals init (class _add target) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/add_PREFIX_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/add_PREFIX_unaligned_2.ilproj index 29d61f567663ad..1cc2edaa948678 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/add_PREFIX_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist.il index 9fc39834409849..a00ecb121b0768 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist.il @@ -19,7 +19,8 @@ arg1==arg4, arg2==arg5, arg3==arg6. */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_32BIT_unaligned_2'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -78,7 +79,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglist_ { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -109,3 +114,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist64.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist64.il index 751f86b0e53a2d..130394f0e13f2f 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist64.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist64.il @@ -19,7 +19,8 @@ arg1==arg4, arg2==arg5, arg3==arg6. */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_64BIT_unaligned_2'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -87,7 +88,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglist64 { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -118,3 +123,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il index f3eed6072f9cd5..f4de71c51cb098 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il @@ -27,7 +27,8 @@ ARM is closer to the native ABI: */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_ARM_unaligned_2'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -88,7 +89,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglistARM { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -119,3 +124,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_32BIT.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_32BIT_unaligned_2.ilproj similarity index 84% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_32BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_32BIT_unaligned_2.ilproj index f06b170c80bf4b..234ed1f8c99c6e 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_32BIT.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_32BIT_unaligned_2.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_64BIT.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_64BIT_unaligned_2.ilproj similarity index 80% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_64BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_64BIT_unaligned_2.ilproj index 3a7d1c3e60d5f8..4aa377bfa4bd75 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_64BIT.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_64BIT_unaligned_2.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_ARM.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_ARM_unaligned_2.ilproj similarity index 84% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_ARM.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_ARM_unaligned_2.ilproj index ca3158bf90969a..5c540429673da8 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_ARM.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_ARM_unaligned_2.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests.il index 8f3399465bd44c..e042124ed36e1e 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests.il @@ -3,18 +3,19 @@ .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly array_tests{} +.assembly 'array_tests_unaligned_2'{} .class value sealed valClass { .field int32 Field } -.class array_tests { +.class public array_tests { .field static int8[] i1 .field static unsigned int8[] u1 @@ -195,7 +196,10 @@ END: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (int32) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests_unaligned_2.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests_unaligned_2.ilproj index 7e6a250b1c9455..c9af748f939666 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk.il index aa36ebc7218ea7..2524997640c27a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk.il @@ -2,19 +2,20 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'cpblk' { +.assembly 'cpblk_unaligned_2' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _cpblk { +.class public _cpblk { //------------------------- // Global Data - @@ -68,7 +69,10 @@ FAIL: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk_unaligned_2.ilproj index 8ce6bd8ab4bd28..b0e4d46a05a00c 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/cpblk_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj.il index 11843a00d643c7..4164e339e023d8 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj.il @@ -6,8 +6,9 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'cpobj' {} +.assembly 'cpobj_unaligned_2' {} .class public _cpobj { @@ -15,6 +16,9 @@ .field public static value class valClass Instance2 .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals (class [mscorlib]System.IO.TextWriter) .maxstack 2 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj_unaligned_2.ilproj index d3813e1eb721d2..d44aaf40e7c84a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/cpobj_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests.il index 3859bc8469b600..195e15a60fcaf4 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests.il @@ -2,14 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly field_tests{} +.assembly 'field_tests_unaligned_2'{} -.class field_tests { +.class public field_tests { .field int8 i1Field .field int16 i2Field @@ -107,7 +108,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (class field_tests) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests_unaligned_2.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests_unaligned_2.ilproj index 247deb1713b8fb..c680de401a6f3a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests.il index b8258e9b2d49be..5fbeae2c05010b 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests.il @@ -2,14 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly fielda_tests{} +.assembly 'fielda_tests_unaligned_2'{} -.class field_tests { +.class public field_tests { .field int8 i1Field .field int16 i2Field @@ -108,7 +109,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (class field_tests) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests_unaligned_2.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests_unaligned_2.ilproj index e1579dff3319e1..96e2ac4fe559a0 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.il index f7db4449c00fc0..1438a3d52dc97d 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'initblk'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'initblk_unaligned_2'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _initblk { +.class public _initblk { // .data DATA = int32(0x00000000) @@ -20,7 +21,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/initblk_unaligned_2.ilproj index 1da6a535ce437a..25dd7266068088 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.il index 28117f68b687c5..1234755626d727 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'initobj'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'initobj_unaligned_2'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -26,6 +27,9 @@ // Entry point - Main - //------------------------- .method public static int32 main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .locals (value class valClass, int32) .maxstack 10 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/initobj_unaligned_2.ilproj index 7544fb3b1fb881..b1b03b850211c1 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.il index 02730af357abf3..8a3f12410b2c7b 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly ldind_stind{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'ldind_stind_unaligned_2'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class ldind_stind { +.class public ldind_stind { //------------------------- // Global Data - @@ -44,7 +45,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind_unaligned_2.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind_unaligned_2.ilproj index 19cd8c05742cc8..936d1950d98145 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca.il index 2a6db18fd7c5a9..6e74b2f43dce79 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca.il @@ -2,21 +2,25 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'ldloca' { +.assembly 'ldloca_unaligned_2' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _ldloca { +.class public _ldloca { //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (int32,int32&) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca_unaligned_2.ilproj index 0da9e74569c4b0..ae5706984cea96 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj.il index 347d49175190ae..7c1958bf1df5db 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj.il @@ -6,14 +6,18 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'ldobj' { +.assembly 'ldobj_unaligned_2' { } .class public _ldobj { .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals (class [mscorlib]System.IO.TextWriter,value class valClass,value class valClass) .maxstack 2 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj_unaligned_2.ilproj index 974849723d39a4..4664a2152d53e7 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldobj_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/localloc.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/localloc.il index ea96334ef89178..6a4136d0854b77 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/localloc.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/localloc.il @@ -6,13 +6,14 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'localloc' { +.assembly 'localloc_unaligned_2' { } -.class _localloc { +.class public _localloc { .method void .ctor() { @@ -22,7 +23,10 @@ ret } -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .locals (class [mscorlib]System.IO.TextWriter,int32*,int32,class [mscorlib]System.Text.StringBuilder,int32,class [mscorlib]System.String) .entrypoint //INITIALIZATION diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/localloc_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/localloc_unaligned_2.ilproj index 795dd9e991bf0c..d236da35b50cd5 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/localloc_unaligned_2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.il index d067c4ae5bd1c2..8329ae7a4c2cf6 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly box_unbox{} +.assembly 'Box_Unbox_unaligned_4'{} //####################################### //# -- valClass -- ################################# @@ -78,7 +79,10 @@ //--------------------------# // entry point -# //--------------------------# -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 // -- initialize the val class diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox_unaligned_4.ilproj index 36090515c8407d..5661ca9880ac03 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.il index f7a19abba1b9e1..d4b8591786e454 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.il @@ -3,18 +3,19 @@ .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'add' { +.assembly 'add_unaligned_4' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class explicit _add { +.class public explicit _add { .field static int32 global0 .field static int32 global1 @@ -22,7 +23,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 5 .locals () diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add_unaligned_4.ilproj index 29d61f567663ad..1cc2edaa948678 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/add.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/add.il index 629d0dd64c3496..b3df4a2c6762ab 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/add.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/add.il @@ -3,18 +3,19 @@ .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'add' { +.assembly 'add_PREFIX_unaligned_4' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _add { +.class public _add { .field static int32 global0 .field static int32 global1 @@ -22,7 +23,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 5 .locals () diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/add_PREFIX_unaligned_4.ilproj similarity index 88% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/add_PREFIX_unaligned_4.ilproj index 613bfa9cc28032..5d4f6409840beb 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/add_PREFIX_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist.il index f7cb305d9d707f..ff45fbb28b4bf4 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist.il @@ -19,7 +19,8 @@ arg1==arg4, arg2==arg5, arg3==arg6. */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_32BIT_unaligned_4'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -77,7 +78,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglist_ { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -108,3 +113,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist64.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist64.il index 635623f76a71da..4c00cd28536968 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist64.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist64.il @@ -19,7 +19,8 @@ arg1==arg4, arg2==arg5, arg3==arg6. */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_64BIT_unaligned_4'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -87,7 +88,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglist64 { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -118,3 +123,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglistARM.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglistARM.il index 85626d71e7cd02..abc1509bfa091f 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglistARM.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglistARM.il @@ -27,7 +27,8 @@ ARM is closer to the native ABI: */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_ARM_unaligned_4'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -87,7 +88,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglistARM { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -118,3 +123,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_32BIT.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_32BIT_unaligned_4.ilproj similarity index 84% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_32BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_32BIT_unaligned_4.ilproj index f06b170c80bf4b..234ed1f8c99c6e 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_32BIT.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_32BIT_unaligned_4.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_64BIT.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_64BIT_unaligned_4.ilproj similarity index 80% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_64BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_64BIT_unaligned_4.ilproj index 3a7d1c3e60d5f8..4aa377bfa4bd75 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_64BIT.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_64BIT_unaligned_4.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_ARM.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_ARM_unaligned_4.ilproj similarity index 84% rename from src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_ARM.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_ARM_unaligned_4.ilproj index ca3158bf90969a..5c540429673da8 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_ARM.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_ARM_unaligned_4.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests.il index 13c790538e4867..806d2df67fe09d 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests.il @@ -2,18 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly array_tests{} +.assembly 'array_tests_unaligned_4'{} .class value sealed valClass { .field int32 Field } -.class array_tests { +.class public array_tests { .field static int8[] i1 .field static unsigned int8[] u1 @@ -194,7 +195,10 @@ END: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (int32) diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests_unaligned_4.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests_unaligned_4.ilproj index 7e6a250b1c9455..c9af748f939666 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/array_tests_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk.il index 32ddf2dab432a8..afae2ebe1f92ec 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk.il @@ -2,19 +2,20 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'cpblk' { +.assembly 'cpblk_unaligned_4' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _cpblk { +.class public _cpblk { //------------------------- // Global Data - @@ -68,7 +69,10 @@ FAIL: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk_unaligned_4.ilproj index 8ce6bd8ab4bd28..b0e4d46a05a00c 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj.il index 411dd5a7b5b436..08605e9fadde83 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj.il @@ -6,9 +6,10 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'cpobj' {} +.assembly 'cpobj_unaligned_4' {} .class public _cpobj { @@ -16,6 +17,9 @@ .field public static value class valClass Instance2 .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals (class [mscorlib]System.IO.TextWriter) .maxstack 2 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj_unaligned_4.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj_unaligned_4.ilproj index 8fc711dc372889..727294b29541fd 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests.il index eb9a3de78046e6..29d6d27d03d320 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests.il @@ -2,14 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly field_tests{} +.assembly 'field_tests_unaligned_4'{} -.class field_tests { +.class public field_tests { .field int8 i1Field .field int16 i2Field @@ -107,7 +108,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (class field_tests) diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests_unaligned_4.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests_unaligned_4.ilproj index 247deb1713b8fb..c680de401a6f3a 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/field_tests_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests.il index 9a65fc39bdfd55..e1b58fa07cd140 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests.il @@ -2,14 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly fielda_tests{} +.assembly 'fielda_tests_unaligned_4'{} -.class field_tests { +.class public field_tests { .field int8 i1Field .field int16 i2Field @@ -107,7 +108,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (class field_tests) diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests_unaligned_4.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests_unaligned_4.ilproj index e1579dff3319e1..96e2ac4fe559a0 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/fielda_tests_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.il index 7be33fa18815ae..31f420ef839b96 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'initblk'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'initblk_unaligned_4'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _initblk { +.class public _initblk { // .data DATA = int32(0x00000000) @@ -20,7 +21,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/initblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/initblk_unaligned_4.ilproj index 1da6a535ce437a..25dd7266068088 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.il index 8f7c37aaf572cc..48d5b686707b55 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'initobj'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'initobj_unaligned_4'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -26,6 +27,9 @@ // Entry point - Main - //------------------------- .method public static int32 main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .locals (value class valClass, int32) .maxstack 10 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/initobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/initobj_unaligned_4.ilproj index 7544fb3b1fb881..b1b03b850211c1 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.il index fafc36d667b26c..45321d335b2e14 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly ldind_stind{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'ldind_stind_unaligned_4'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class ldind_stind { +.class public ldind_stind { //------------------------- // Global Data - @@ -44,7 +45,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind_unaligned_4.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind_unaligned_4.ilproj index 19cd8c05742cc8..936d1950d98145 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca.il index c2466b1014354a..a2a4bd09aba5fa 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca.il @@ -2,21 +2,25 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'ldloca' { +.assembly 'ldloca_unaligned_4' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _ldloca { +.class public _ldloca { //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (int32,int32&) diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca_unaligned_4.ilproj index 0da9e74569c4b0..ae5706984cea96 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj.il index bb660619e0d738..3c87075e26bf68 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj.il @@ -6,14 +6,18 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'ldobj' { +.assembly 'ldobj_unaligned_4' { } .class public _ldobj { .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals (class [mscorlib]System.IO.TextWriter,value class valClass,value class valClass) .maxstack 2 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj_unaligned_4.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj_unaligned_4.ilproj index f3cf514f67c3d7..4187891a7fb2bb 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldobj_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/localloc.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/localloc.il index 2ffdfc1a6d4aec..ab5f5a5b653008 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/localloc.il +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/localloc.il @@ -6,14 +6,15 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'localloc' { +.assembly 'localloc_unaligned_4' { } -.class _localloc { +.class public _localloc { .method void .ctor() { @@ -23,7 +24,10 @@ ret } -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .locals (class [mscorlib]System.IO.TextWriter,int32*,int32,class [mscorlib]System.Text.StringBuilder,int32,string) .entrypoint call class [mscorlib]System.IO.TextWriter [System.Console]System.Console::get_Out() diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/localloc.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/localloc_unaligned_4.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/volatile/1/localloc.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/localloc_unaligned_4.ilproj index 4259991549266b..ddd12ec0ef756a 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/localloc.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/localloc_unaligned_4.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox.il b/src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox.il index 3af610b476b463..c6931c3ccd2850 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly box_unbox{} +.assembly 'Box_Unbox_volatile'{} //####################################### //# -- valClass -- ################################# @@ -78,7 +79,10 @@ //--------------------------# // entry point -# //--------------------------# -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 // -- initialize the val class diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox_volatile.ilproj index 36090515c8407d..5661ca9880ac03 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.il b/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.il index 028f31b07eeeac..905d7687bb3eb3 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.il @@ -3,18 +3,19 @@ .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'add' { +.assembly 'add_volatile' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class explicit _add { +.class public explicit _add { .field [0] int32 global0 .field [4] int32 global1 @@ -24,7 +25,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 6 .locals init (class _add target) diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add_volatile.ilproj index 29d61f567663ad..1cc2edaa948678 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/add.il b/src/tests/JIT/Directed/PREFIX/volatile/1/add.il index 028f31b07eeeac..3de595699d93ce 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/add.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/add.il @@ -3,18 +3,19 @@ .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'add' { +.assembly 'add_PREFIX_volatile' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class explicit _add { +.class public explicit _add { .field [0] int32 global0 .field [4] int32 global1 @@ -24,7 +25,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 6 .locals init (class _add target) diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/add.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/add_PREFIX_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/add.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/add_PREFIX_volatile.ilproj index 45a95366760918..3871e24f9ac8ea 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/add_PREFIX_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist.il b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist.il index 782151eb003ee8..773704844d4bca 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist.il @@ -19,7 +19,8 @@ arg1==arg4, arg2==arg5, arg3==arg6. */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_32BIT_volatile'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -79,7 +80,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglist_ { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -110,3 +115,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist64.il b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist64.il index 5a5b3517aa0198..7dc1e828e7465f 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist64.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist64.il @@ -19,7 +19,8 @@ arg1==arg4, arg2==arg5, arg3==arg6. */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_64BIT_volatile'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -87,7 +88,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglist64 { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -118,3 +123,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglistARM.il b/src/tests/JIT/Directed/PREFIX/volatile/1/arglistARM.il index cd9e5017aa84f9..a556125c58c5d5 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglistARM.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglistARM.il @@ -27,7 +27,8 @@ ARM is closer to the native ABI: */ .assembly extern legacy library mscorlib {} -.assembly 'arglist'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly extern xunit.core {} +.assembly 'arglist_Target_ARM_volatile'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -89,7 +90,11 @@ REALLYDONE: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.class public auto ansi arglistARM { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals () .maxstack 10 @@ -120,3 +125,4 @@ FAIL: ldc.i4 0x0 ret } +} diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_32BIT.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_32BIT_volatile.ilproj similarity index 84% rename from src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_32BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_32BIT_volatile.ilproj index f06b170c80bf4b..234ed1f8c99c6e 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_32BIT.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_32BIT_volatile.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_64BIT.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_64BIT_volatile.ilproj similarity index 80% rename from src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_64BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_64BIT_volatile.ilproj index 3a7d1c3e60d5f8..4aa377bfa4bd75 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_64BIT.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_64BIT_volatile.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_ARM.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_ARM_volatile.ilproj similarity index 84% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_ARM.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_ARM_volatile.ilproj index ca3158bf90969a..5c540429673da8 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_ARM.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_ARM_volatile.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/array_tests.il b/src/tests/JIT/Directed/PREFIX/volatile/1/array_tests.il index 66e21a18c52dd1..8dffcf4ebb9e35 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/array_tests.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/array_tests.il @@ -2,18 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly array_tests{} +.assembly 'array_tests_volatile'{} .class value sealed valClass { .field int32 Field } -.class array_tests { +.class public array_tests { .field static int8[] i1 .field static unsigned int8[] u1 @@ -216,7 +217,10 @@ END: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (int32) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/array_tests_volatile.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/array_tests_volatile.ilproj index 7e6a250b1c9455..c9af748f939666 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/array_tests_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/cpblk.il b/src/tests/JIT/Directed/PREFIX/volatile/1/cpblk.il index cd2dba0abab9ec..525d26d7db97c2 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/cpblk.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/cpblk.il @@ -2,18 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'cpblk' { +.assembly 'cpblk_volatile' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _cpblk { +.class public _cpblk { //------------------------- // Global Data - @@ -67,7 +68,10 @@ FAIL: //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/cpblk_volatile.ilproj similarity index 75% rename from src/tests/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/cpblk_volatile.ilproj index 91662a7326991f..ea0bdf9f44838e 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/cpblk_volatile.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/cpobj.il b/src/tests/JIT/Directed/PREFIX/volatile/1/cpobj.il index 3a6b1de45de927..b0736fdd4363a6 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/cpobj.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/cpobj.il @@ -6,9 +6,10 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'cpobj' {} +.assembly 'cpobj_volatile' {} .class public _cpobj { @@ -16,6 +17,9 @@ .field static value class valClass Instance2 .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals (class [mscorlib]System.IO.TextWriter) .maxstack 2 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/cpobj_volatile.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/cpobj_volatile.ilproj index 8fc711dc372889..727294b29541fd 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/cpobj_volatile.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/field_tests.il b/src/tests/JIT/Directed/PREFIX/volatile/1/field_tests.il index 9970be1a45c968..2450abc7f67df4 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/field_tests.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/field_tests.il @@ -2,14 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly field_tests{} +.assembly 'field_tests_volatile'{} -.class field_tests { +.class public field_tests { .field int8 i1Field .field int16 i2Field @@ -114,7 +115,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (class field_tests) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/field_tests_volatile.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/field_tests_volatile.ilproj index 247deb1713b8fb..c680de401a6f3a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/field_tests_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests.il b/src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests.il index ee50234b1d435c..6ec839b2a2758d 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests.il @@ -2,14 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly fielda_tests{} +.assembly 'fielda_tests_volatile'{} -.class field_tests { +.class public field_tests { .field int8 i1Field .field int16 i2Field @@ -114,7 +115,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (class field_tests) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests_volatile.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests_volatile.ilproj index e1579dff3319e1..96e2ac4fe559a0 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.il b/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.il index 81375b57d2238b..d6794e878d3b5c 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'initblk'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'initblk_volatile'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _initblk { +.class public _initblk { // .data DATA = int32(0x00000000) @@ -20,7 +21,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/initblk_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/initblk_volatile.ilproj index 1da6a535ce437a..25dd7266068088 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/initblk_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.il b/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.il index 29d5f581406516..2d09c1a601da8f 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'initobj'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'initobj_volatile'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } @@ -25,7 +26,10 @@ //------------------------- // Entry point - Main - //------------------------- - .method static int32 main() { + .method public static int32 main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .locals (value class valClass, int32) .maxstack 10 diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/initobj_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/initobj_volatile.ilproj index 7544fb3b1fb881..b1b03b850211c1 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/initobj_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.il b/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.il index 1a2933e688a89d..1b2d0720f6d903 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.il @@ -2,16 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly ldind_stind{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: +.assembly 'ldind_stind_volatile'{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class ldind_stind { +.class public ldind_stind { //------------------------- // Global Data - @@ -43,7 +44,10 @@ //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 //---------------- diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind_volatile.ilproj similarity index 90% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind_volatile.ilproj index 19cd8c05742cc8..936d1950d98145 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca.il b/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca.il index ceab5c388459fd..9919798bbe72f0 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca.il @@ -2,21 +2,25 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'ldloca' { +.assembly 'ldloca_volatile' { //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration: //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )] } -.class _ldloca { +.class public _ldloca { //------------------------- // Entry point - Main - //------------------------- -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 10 .locals (int32,int32&) diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/ldloca_volatile.ilproj index 0da9e74569c4b0..ae5706984cea96 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca_volatile.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/ldobj.il b/src/tests/JIT/Directed/PREFIX/volatile/1/ldobj.il index 7b80b49ec9a33c..5e93fbd22badcf 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/ldobj.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/ldobj.il @@ -6,15 +6,19 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'ldobj' { +.assembly 'ldobj_volatile' { } .class public _ldobj { .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .locals (class [mscorlib]System.IO.TextWriter,value class valClass,value class valClass) .maxstack 2 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/ldobj_volatile.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/ldobj_volatile.ilproj index f3cf514f67c3d7..4187891a7fb2bb 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/ldobj_volatile.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/localloc.il b/src/tests/JIT/Directed/PREFIX/volatile/1/localloc.il index 7e67871a7ccd6e..d5be7d217326d8 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/localloc.il +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/localloc.il @@ -6,14 +6,15 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'localloc' { +.assembly 'localloc_volatile' { } -.class _localloc { +.class public _localloc { .method void .ctor() { @@ -23,7 +24,10 @@ ret } -.method static int32 main() { +.method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .locals (class [mscorlib]System.IO.TextWriter,int32*,int32,class [mscorlib]System.Text.StringBuilder,int32,string) .entrypoint call class [mscorlib]System.IO.TextWriter [System.Console]System.Console::get_Out() diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/localloc_volatile.ilproj similarity index 91% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/localloc_volatile.ilproj index 4259991549266b..ddd12ec0ef756a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/localloc_volatile.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/RVAInit/extended.il b/src/tests/JIT/Directed/RVAInit/extended.il index 29745f7bd2a54b..bbfb190c51e857 100644 --- a/src/tests/JIT/Directed/RVAInit/extended.il +++ b/src/tests/JIT/Directed/RVAInit/extended.il @@ -23,7 +23,7 @@ .namespace JitTest { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .field private static unsigned int8 buffer at D_1 @@ -119,8 +119,7 @@ IL_0024: ret } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/RVAInit/extended.ilproj b/src/tests/JIT/Directed/RVAInit/extended.ilproj index d2d994f7fe57d9..d7eb61a02264ae 100644 --- a/src/tests/JIT/Directed/RVAInit/extended.ilproj +++ b/src/tests/JIT/Directed/RVAInit/extended.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/RVAInit/gcref1.ilproj b/src/tests/JIT/Directed/RVAInit/gcref1.ilproj index 69938be6c447b8..3237683afcdaaf 100644 --- a/src/tests/JIT/Directed/RVAInit/gcref1.ilproj +++ b/src/tests/JIT/Directed/RVAInit/gcref1.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/RVAInit/gcref2.ilproj b/src/tests/JIT/Directed/RVAInit/gcref2.ilproj index 660f2bcbdfa621..dc1f0debc4d906 100644 --- a/src/tests/JIT/Directed/RVAInit/gcref2.ilproj +++ b/src/tests/JIT/Directed/RVAInit/gcref2.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/RVAInit/nested.ilproj b/src/tests/JIT/Directed/RVAInit/nested.ilproj index 5dfa46e7bb5c8b..08e4dfd4444f3a 100644 --- a/src/tests/JIT/Directed/RVAInit/nested.ilproj +++ b/src/tests/JIT/Directed/RVAInit/nested.ilproj @@ -1,6 +1,7 @@ - Exe + + true true 1 diff --git a/src/tests/JIT/Directed/RVAInit/oddsize.il b/src/tests/JIT/Directed/RVAInit/oddsize.il index 8c04d8da0ed1fd..c608160862768b 100644 --- a/src/tests/JIT/Directed/RVAInit/oddsize.il +++ b/src/tests/JIT/Directed/RVAInit/oddsize.il @@ -16,7 +16,7 @@ .file alignment 512 // Image base: 0x034f0000 -.class private sequential ansi sealed beforefieldinit Test_oddsize +.class public sequential ansi sealed beforefieldinit Test_oddsize extends [mscorlib]System.ValueType { .field public static valuetype Test_oddsize test1 at bytearray2 @@ -32,7 +32,7 @@ call void [System.Console]System.Console::WriteLine() ret } - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/RVAInit/oddsize.ilproj b/src/tests/JIT/Directed/RVAInit/oddsize.ilproj index 29566cb0969cec..d2c1ad108348a4 100644 --- a/src/tests/JIT/Directed/RVAInit/oddsize.ilproj +++ b/src/tests/JIT/Directed/RVAInit/oddsize.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/RVAInit/overlap.il b/src/tests/JIT/Directed/RVAInit/overlap.il index 19463e014307f5..fb973032e70f94 100644 --- a/src/tests/JIT/Directed/RVAInit/overlap.il +++ b/src/tests/JIT/Directed/RVAInit/overlap.il @@ -21,7 +21,7 @@ .file alignment 512 -.class private sequential ansi sealed beforefieldinit Test_overlap +.class public sequential ansi sealed beforefieldinit Test_overlap extends [mscorlib]System.ValueType { .field public unsigned int32 _uint @@ -223,7 +223,7 @@ IL_008d: ret } - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/RVAInit/overlap.ilproj b/src/tests/JIT/Directed/RVAInit/overlap.ilproj index d83610048f49c3..c45d0b91638f26 100644 --- a/src/tests/JIT/Directed/RVAInit/overlap.ilproj +++ b/src/tests/JIT/Directed/RVAInit/overlap.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/RVAInit/simple.il b/src/tests/JIT/Directed/RVAInit/simple.il index 07d30446ab94e0..9e79915b42d961 100644 --- a/src/tests/JIT/Directed/RVAInit/simple.il +++ b/src/tests/JIT/Directed/RVAInit/simple.il @@ -12,7 +12,7 @@ .assembly simple { } -.class private sequential ansi sealed beforefieldinit Test_simple +.class public sequential ansi sealed beforefieldinit Test_simple extends [mscorlib]System.ValueType { .field public unsigned int8 _byte @@ -214,7 +214,7 @@ IL_008d: ret } // end of method Test::VerifyStruct - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/RVAInit/simple.ilproj b/src/tests/JIT/Directed/RVAInit/simple.ilproj index 6e342e6eb933bc..9511d04b315cb0 100644 --- a/src/tests/JIT/Directed/RVAInit/simple.ilproj +++ b/src/tests/JIT/Directed/RVAInit/simple.ilproj @@ -1,6 +1,7 @@ - Exe + + true true 1 diff --git a/src/tests/JIT/Directed/RVAInit/simplearg.il b/src/tests/JIT/Directed/RVAInit/simplearg.il index 53a97830a9ff84..d1199f8c45fe79 100644 --- a/src/tests/JIT/Directed/RVAInit/simplearg.il +++ b/src/tests/JIT/Directed/RVAInit/simplearg.il @@ -86,7 +86,7 @@ } // end of class SimpleArg.Holder -.class private auto ansi SimpleArg.Program +.class public auto ansi SimpleArg.Program extends [mscorlib]System.Object { .method private hidebysig static int32 @@ -99,8 +99,7 @@ IL_0007: ret } // end of method Program::Method - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/RVAInit/simplearg.ilproj b/src/tests/JIT/Directed/RVAInit/simplearg.ilproj index ff6412c495a2b7..e00db5913c1204 100644 --- a/src/tests/JIT/Directed/RVAInit/simplearg.ilproj +++ b/src/tests/JIT/Directed/RVAInit/simplearg.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/StrAccess/straccess1.cs b/src/tests/JIT/Directed/StrAccess/straccess1.cs index bae1a82f57d045..adc7bfe425a16d 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess1.cs +++ b/src/tests/JIT/Directed/StrAccess/straccess1.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; internal struct VT { @@ -16,7 +17,7 @@ internal class CL public char b0, b1, b2, b3, b4, b5, b6; } -internal class StrAccess1 +public class StrAccess1 { public static String str1 = "test string"; public static String[,] str2darr = { { "test string" } }; @@ -35,7 +36,8 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed, }; public static Random rand = new Random(Seed); - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; String str2 = "test string"; diff --git a/src/tests/JIT/Directed/StrAccess/straccess1_cs_d.csproj b/src/tests/JIT/Directed/StrAccess/straccess1_cs_d.csproj index 340b69c52b191a..bb04da7db452d5 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess1_cs_d.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess1_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StrAccess/straccess1_cs_do.csproj b/src/tests/JIT/Directed/StrAccess/straccess1_cs_do.csproj index d45537daa24210..8287a22261f4f6 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess1_cs_do.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess1_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StrAccess/straccess1_cs_r.csproj b/src/tests/JIT/Directed/StrAccess/straccess1_cs_r.csproj index 7d451be82a7599..973c41aef908ec 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess1_cs_r.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess1_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StrAccess/straccess1_cs_ro.csproj b/src/tests/JIT/Directed/StrAccess/straccess1_cs_ro.csproj index 163526742a61c0..ebb40a08818221 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess1_cs_ro.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess1_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/StrAccess/straccess2.cs b/src/tests/JIT/Directed/StrAccess/straccess2.cs index 77f6eaf9fb8802..1ea6f167e461dc 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess2.cs +++ b/src/tests/JIT/Directed/StrAccess/straccess2.cs @@ -5,6 +5,7 @@ //Similar to StrAccess1, but instead of using constants, different expression is used as the index to access the string using System; +using Xunit; internal struct VT { @@ -22,7 +23,7 @@ internal class CL public int[,] idx2darr = { { 5, 6 } }; } -internal unsafe class StrAccess2 +public unsafe class StrAccess2 { public static String str1 = "test string"; public static int idx1 = 2; @@ -47,7 +48,8 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed, }; public static Random rand = new Random(Seed); - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; int* p = stackalloc int[11]; diff --git a/src/tests/JIT/Directed/StrAccess/straccess2_cs_d.csproj b/src/tests/JIT/Directed/StrAccess/straccess2_cs_d.csproj index 7e09b78ff5bd0f..925f622d0e1d99 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess2_cs_d.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess2_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StrAccess/straccess2_cs_do.csproj b/src/tests/JIT/Directed/StrAccess/straccess2_cs_do.csproj index 9cb75e8e91a616..0d71331cb6901d 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess2_cs_do.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess2_cs_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/StrAccess/straccess2_cs_r.csproj b/src/tests/JIT/Directed/StrAccess/straccess2_cs_r.csproj index 52c595c0e0813e..175d25324e6b44 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess2_cs_r.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess2_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StrAccess/straccess2_cs_ro.csproj b/src/tests/JIT/Directed/StrAccess/straccess2_cs_ro.csproj index b19b470875748b..644fd13f9d85a7 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess2_cs_ro.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess2_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/StrAccess/straccess3.cs b/src/tests/JIT/Directed/StrAccess/straccess3.cs index 52c4d32ecc5752..d4eb8f3f72ffb5 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess3.cs +++ b/src/tests/JIT/Directed/StrAccess/straccess3.cs @@ -6,6 +6,8 @@ //IndexOutOfRangeException using System; +using Xunit; +using System.Runtime.CompilerServices; internal struct VT { @@ -17,7 +19,7 @@ internal class CL public String str; } -internal class StrAccess1 +public class StrAccess1 { public static String str1; public const int DefaultSeed = 20010415; @@ -46,24 +48,33 @@ private static string randomUnicodeString(int len) return str; } - public static int Main(string[] args) + [Fact] + public static int TestEntryPoint() { - bool passed; + //construct random string with random length + int len = rand.Next(50); + return Run(randomUnicodeString(len)); + } - string teststr = ""; - int len = 0; + // public static int Main(string[] args) + // { + // if (args.Length != 0) + // { + // return Run(args[0]); + // } + // else + // { + // return TestEntryPoint(); + // } + // } + + [MethodImpl(MethodImplOptions.NoInlining)] + public static int Run(string arg) + { + bool passed; - if (args.Length != 0) - { - teststr = args[0]; - len = teststr.Length; - } - else - { - //construct random string with random length - len = rand.Next(50); - teststr = randomUnicodeString(len); - } + string teststr = arg; + int len = arg.Length; Console.WriteLine("Test string is {0}", teststr); diff --git a/src/tests/JIT/Directed/StrAccess/straccess3_cs_d.csproj b/src/tests/JIT/Directed/StrAccess/straccess3_cs_d.csproj index 30f1e4c6fb832b..117810d8e4e620 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess3_cs_d.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess3_cs_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/StrAccess/straccess3_cs_do.csproj b/src/tests/JIT/Directed/StrAccess/straccess3_cs_do.csproj index 3488df63056fd8..d71677789c35f4 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess3_cs_do.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess3_cs_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/StrAccess/straccess3_cs_r.csproj b/src/tests/JIT/Directed/StrAccess/straccess3_cs_r.csproj index 6b1770a12a5087..52615fda89216d 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess3_cs_r.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess3_cs_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/StrAccess/straccess3_cs_ro.csproj b/src/tests/JIT/Directed/StrAccess/straccess3_cs_ro.csproj index 66a19bb8cb42d7..509ee2c438b94f 100644 --- a/src/tests/JIT/Directed/StrAccess/straccess3_cs_ro.csproj +++ b/src/tests/JIT/Directed/StrAccess/straccess3_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/StrAccess/straccess4.cs b/src/tests/JIT/Directed/StrAccess/straccess4.cs deleted file mode 100644 index 52c4d32ecc5752..00000000000000 --- a/src/tests/JIT/Directed/StrAccess/straccess4.cs +++ /dev/null @@ -1,205 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// - -//random length and random content string -//IndexOutOfRangeException - -using System; - -internal struct VT -{ - public String str; -} - -internal class CL -{ - public String str; -} - -internal class StrAccess1 -{ - public static String str1; - public const int DefaultSeed = 20010415; - public static int Seed = Environment.GetEnvironmentVariable("CORECLR_SEED") switch - { - string seedStr when seedStr.Equals("random", StringComparison.OrdinalIgnoreCase) => new Random().Next(), - string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed, - _ => DefaultSeed - }; - - public static Random rand = new Random(Seed); - - private static int randomUnicodeLetterOrDigit() - { - int c = (char)rand.Next((int)Char.MinValue, (int)Char.MaxValue); - while (!Char.IsLetterOrDigit((char)c)) - c = rand.Next((int)Char.MinValue, (int)Char.MaxValue); - return c; - } - - private static string randomUnicodeString(int len) - { - string str = ""; - while (len-- >= 0) - str += "\\u" + randomUnicodeLetterOrDigit().ToString("X4"); - return str; - } - - public static int Main(string[] args) - { - bool passed; - - string teststr = ""; - int len = 0; - - if (args.Length != 0) - { - teststr = args[0]; - len = teststr.Length; - } - else - { - //construct random string with random length - len = rand.Next(50); - teststr = randomUnicodeString(len); - } - - Console.WriteLine("Test string is {0}", teststr); - - String str2 = ""; - CL cl1 = new CL(); - VT vt1; - - str1 = str2 = cl1.str = vt1.str = teststr; - - String[] str1darr = new String[len]; - for (int j = 0; j < len; j++) - str1darr[j] = Convert.ToString(teststr[j]); - - char b0, b1, b2, b3, b4; - try - { - passed = false; - b0 = cl1.str[len]; - } - catch (IndexOutOfRangeException) - { - passed = true; - } - try - { - passed = false; - b1 = str1[len]; - } - catch (IndexOutOfRangeException) - { - passed = true; - } - try - { - passed = false; - b2 = str2[len]; - } - catch (IndexOutOfRangeException) - { - passed = true; - } - try - { - passed = false; - b3 = vt1.str[len]; - } - catch (IndexOutOfRangeException) - { - passed = true; - } - try - { - passed = false; - b4 = Convert.ToChar(str1darr[len]); - } - catch (IndexOutOfRangeException) - { - passed = true; - } - - try - { - passed = false; - b0 = cl1.str[-1]; - } - catch (IndexOutOfRangeException) - { - passed = true; - } - try - { - passed = false; - b1 = str1[-1]; - } - catch (IndexOutOfRangeException) - { - passed = true; - } - try - { - passed = false; - b2 = str2[-1]; - } - catch (IndexOutOfRangeException) - { - passed = true; - } - try - { - passed = false; - b3 = vt1.str[-1]; - } - catch (IndexOutOfRangeException) - { - passed = true; - } - try - { - passed = false; - b4 = Convert.ToChar(str1darr[-1]); - } - catch (IndexOutOfRangeException) - { - passed = true; - } - - int i; - while (len != 0) - { - i = rand.Next(0, len); - b0 = cl1.str[i]; - b1 = str1[i]; - b2 = str2[i]; - b3 = vt1.str[i]; - b4 = Convert.ToChar(str1darr[i]); - if ((b0 != b1) || (b1 != b2) || (b2 != b3) || (b3 != b4)) - passed = false; - len /= 2; - } - - Console.WriteLine(); - if (!passed) - { - Console.WriteLine("FAILED"); - Console.WriteLine("Use the following command to repro:"); - Console.WriteLine("straccess3.exe {0}", teststr); - return 1; - } - else - { - Console.WriteLine("PASSED"); - return 100; - } - } -} - - - - diff --git a/src/tests/JIT/Directed/StrAccess/straccess4.csproj b/src/tests/JIT/Directed/StrAccess/straccess4.csproj deleted file mode 100644 index d427ffca5f69b5..00000000000000 --- a/src/tests/JIT/Directed/StrAccess/straccess4.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - Exe - - - Full - False - - - - - diff --git a/src/tests/JIT/Directed/StructABI/FieldListByteNodeTypeMismatchX86.cs b/src/tests/JIT/Directed/StructABI/FieldListByteNodeTypeMismatchX86.cs index 1872ca38d7e628..19417aec54b1fc 100644 --- a/src/tests/JIT/Directed/StructABI/FieldListByteNodeTypeMismatchX86.cs +++ b/src/tests/JIT/Directed/StructABI/FieldListByteNodeTypeMismatchX86.cs @@ -1,12 +1,14 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Xunit; public unsafe class FieldListByteNodeTypeMismatchX86 { private static readonly byte* _addr = (byte*)Marshal.AllocHGlobal(20); private static int _result = 100; - public static int Main() + [Fact] + public static int TestEntryPoint() { int sum = 0; Problem(&sum); diff --git a/src/tests/JIT/Directed/StructABI/FieldListByteNodeTypeMismatchX86.csproj b/src/tests/JIT/Directed/StructABI/FieldListByteNodeTypeMismatchX86.csproj index 6d06d331a2a599..8b5eb67f78c566 100644 --- a/src/tests/JIT/Directed/StructABI/FieldListByteNodeTypeMismatchX86.csproj +++ b/src/tests/JIT/Directed/StructABI/FieldListByteNodeTypeMismatchX86.csproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Directed/StructABI/MisSizedStructs.cs b/src/tests/JIT/Directed/StructABI/MisSizedStructs.cs index 3fb55a909960f6..54e63fbf8c746c 100644 --- a/src/tests/JIT/Directed/StructABI/MisSizedStructs.cs +++ b/src/tests/JIT/Directed/StructABI/MisSizedStructs.cs @@ -4,12 +4,14 @@ using System; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using Xunit; public unsafe class MisSizedStructs { public const byte ByteValue = 0xC1; - public static int Main() + [Fact] + public static int TestEntryPoint() { const int BytesSize = 256; var bytes = stackalloc byte[BytesSize]; diff --git a/src/tests/JIT/Directed/StructABI/MisSizedStructs.csproj b/src/tests/JIT/Directed/StructABI/MisSizedStructs.csproj index de62e29fa3e187..47508bb49d57bf 100644 --- a/src/tests/JIT/Directed/StructABI/MisSizedStructs.csproj +++ b/src/tests/JIT/Directed/StructABI/MisSizedStructs.csproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Directed/StructABI/MisSizedStructs_ArmArch.cs b/src/tests/JIT/Directed/StructABI/MisSizedStructs_ArmArch.cs index 6cd2367b327286..1b3ec490a9ed4a 100644 --- a/src/tests/JIT/Directed/StructABI/MisSizedStructs_ArmArch.cs +++ b/src/tests/JIT/Directed/StructABI/MisSizedStructs_ArmArch.cs @@ -4,12 +4,14 @@ using System; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using Xunit; public unsafe class MisSizedStructs_ArmSplit { public const byte ByteValue = 0xC1; - public static int Main() + [Fact] + public static int TestEntryPoint() { if (ProblemWithOutOfBoundsLoads(out int result)) { diff --git a/src/tests/JIT/Directed/StructABI/MisSizedStructs_ArmArch.csproj b/src/tests/JIT/Directed/StructABI/MisSizedStructs_ArmArch.csproj index de62e29fa3e187..47508bb49d57bf 100644 --- a/src/tests/JIT/Directed/StructABI/MisSizedStructs_ArmArch.csproj +++ b/src/tests/JIT/Directed/StructABI/MisSizedStructs_ArmArch.csproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Directed/StructABI/SevenByteStruct.cs b/src/tests/JIT/Directed/StructABI/SevenByteStruct.cs index b8924b99bc417f..0f4d38f8674872 100644 --- a/src/tests/JIT/Directed/StructABI/SevenByteStruct.cs +++ b/src/tests/JIT/Directed/StructABI/SevenByteStruct.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; +using Xunit; // On ARM32 the following has S0 passed in two registers, which requires passing 3 bytes in the last register. // We cannot do that in a single load from an arbitrary source and must copy it to a local first. @@ -20,7 +21,8 @@ public struct S0 public class SevenByteStruct { public static S0 s_4 = new S0 { F0 = 1, F1 = 2, F2 = 3, F3 = 4, F4 = 5, F5 = 6, F6 = 7 }; - public static int Main() + [Fact] + public static int TestEntryPoint() { ref S0 vr0 = ref s_4; int sum = M35(vr0); diff --git a/src/tests/JIT/Directed/StructABI/SevenByteStruct.csproj b/src/tests/JIT/Directed/StructABI/SevenByteStruct.csproj index 9d281a449d0710..53268712f72b8a 100644 --- a/src/tests/JIT/Directed/StructABI/SevenByteStruct.csproj +++ b/src/tests/JIT/Directed/StructABI/SevenByteStruct.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/StructABI/StructABI.cs b/src/tests/JIT/Directed/StructABI/StructABI.cs index cba7bae7377f9e..2f74d49e75853f 100644 --- a/src/tests/JIT/Directed/StructABI/StructABI.cs +++ b/src/tests/JIT/Directed/StructABI/StructABI.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using Xunit; struct SingleByte { @@ -2153,7 +2154,8 @@ static bool EnoughRegistersSysV4Wrapper() return ok; } - static int Main() + [Fact] + public static int TestEntryPoint() { var ok = true; diff --git a/src/tests/JIT/Directed/StructABI/StructABI.csproj b/src/tests/JIT/Directed/StructABI/StructABI.csproj index f56c320ec48d4f..4a7b9d274aa4eb 100644 --- a/src/tests/JIT/Directed/StructABI/StructABI.csproj +++ b/src/tests/JIT/Directed/StructABI/StructABI.csproj @@ -1,6 +1,7 @@ - Exe + + true true diff --git a/src/tests/JIT/Directed/StructABI/StructWithOverlappingFields.cs b/src/tests/JIT/Directed/StructABI/StructWithOverlappingFields.cs index d37600f1b1ff8f..ee8d8174d12396 100644 --- a/src/tests/JIT/Directed/StructABI/StructWithOverlappingFields.cs +++ b/src/tests/JIT/Directed/StructABI/StructWithOverlappingFields.cs @@ -6,6 +6,7 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; +using Xunit; namespace Opt_Error { @@ -64,7 +65,7 @@ public FourByteStruct(int val) } } - class Program + public class Program { static void TestClass(int initVal) { @@ -118,7 +119,8 @@ static void TestStruct(int initVal) Debug.Assert(cse_val_2 == 52); } - static int Main() + [Fact] + public static int TestEntryPoint() { TestClass(2); TestStruct(2); diff --git a/src/tests/JIT/Directed/StructABI/StructWithOverlappingFields.csproj b/src/tests/JIT/Directed/StructABI/StructWithOverlappingFields.csproj index 404058b0736fe3..044f050294082c 100644 --- a/src/tests/JIT/Directed/StructABI/StructWithOverlappingFields.csproj +++ b/src/tests/JIT/Directed/StructABI/StructWithOverlappingFields.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/StructABI/TypeMismatchedArgs.cs b/src/tests/JIT/Directed/StructABI/TypeMismatchedArgs.cs index ceb0bdc6736b0b..3933d03a5b8ce9 100644 --- a/src/tests/JIT/Directed/StructABI/TypeMismatchedArgs.cs +++ b/src/tests/JIT/Directed/StructABI/TypeMismatchedArgs.cs @@ -6,6 +6,7 @@ using System.Runtime.Intrinsics; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using Xunit; public unsafe class TypeMismatchedArgs { @@ -14,7 +15,8 @@ public unsafe class TypeMismatchedArgs private static readonly FourDblLngUnion s_fourDblLngHfa = new FourDblLngUnion { Lngs = { LongOne = 30 } }; private static readonly Vtor128Union s_vtor128 = new Vtor128Union { Vtor4 = new Vector4(4, 3, 2, 1) }; - public static int Main() + [Fact] + public static int TestEntryPoint() { if (ProblemWithHfasMismatch(s_hfaDblFlt.FltHfa)) { diff --git a/src/tests/JIT/Directed/StructABI/TypeMismatchedArgs.csproj b/src/tests/JIT/Directed/StructABI/TypeMismatchedArgs.csproj index de62e29fa3e187..47508bb49d57bf 100644 --- a/src/tests/JIT/Directed/StructABI/TypeMismatchedArgs.csproj +++ b/src/tests/JIT/Directed/StructABI/TypeMismatchedArgs.csproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Directed/StructABI/structfieldparam.cs b/src/tests/JIT/Directed/StructABI/structfieldparam.cs index b22100b7a0e29f..06542e0eadd526 100644 --- a/src/tests/JIT/Directed/StructABI/structfieldparam.cs +++ b/src/tests/JIT/Directed/StructABI/structfieldparam.cs @@ -9,6 +9,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace structfieldparam { @@ -104,7 +105,8 @@ static long test2(Inner2 s) return s.sum(); } - public static int Main() + [Fact] + public static int TestEntryPoint() { int result = 100; diff --git a/src/tests/JIT/Directed/StructABI/structfieldparam_r.csproj b/src/tests/JIT/Directed/StructABI/structfieldparam_r.csproj index ac7d36843199b7..5b431daed29529 100644 --- a/src/tests/JIT/Directed/StructABI/structfieldparam_r.csproj +++ b/src/tests/JIT/Directed/StructABI/structfieldparam_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/StructABI/structfieldparam_ro.csproj b/src/tests/JIT/Directed/StructABI/structfieldparam_ro.csproj index ab5cb4d8b06747..ed3455999708e7 100644 --- a/src/tests/JIT/Directed/StructABI/structfieldparam_ro.csproj +++ b/src/tests/JIT/Directed/StructABI/structfieldparam_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/StructABI/structreturn.cs b/src/tests/JIT/Directed/StructABI/structreturn.cs index 16704453f35f45..6968ce2bd86eaa 100644 --- a/src/tests/JIT/Directed/StructABI/structreturn.cs +++ b/src/tests/JIT/Directed/StructABI/structreturn.cs @@ -9,6 +9,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics; +using Xunit; #region Test struct return optimizations. class TestStructReturns @@ -1809,9 +1810,10 @@ public static void Test() } } -class TestStructs +public class TestStructs { - public static int Main() + [Fact] + public static int TestEntryPoint() { TestStructReturns.Test(); TestUnsafeCasts.Test(); diff --git a/src/tests/JIT/Directed/StructABI/structreturn.csproj b/src/tests/JIT/Directed/StructABI/structreturn.csproj index 5e53f9c993f60b..a6fd7d9bf157f7 100644 --- a/src/tests/JIT/Directed/StructABI/structreturn.csproj +++ b/src/tests/JIT/Directed/StructABI/structreturn.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/StructPromote/FldSeqsInPromotedCpBlk.cs b/src/tests/JIT/Directed/StructPromote/FldSeqsInPromotedCpBlk.cs index 65be5229e25eb4..7183fe04dc2410 100644 --- a/src/tests/JIT/Directed/StructPromote/FldSeqsInPromotedCpBlk.cs +++ b/src/tests/JIT/Directed/StructPromote/FldSeqsInPromotedCpBlk.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; +using Xunit; // In this test, we have a block assignment with a source that is a promoted struct and // an indirect destination. When morphing it, we would decompose that assignment into a series @@ -21,9 +22,10 @@ // // The fix was to reuse the address for the last field instead. -class FldSeqsInPromotedCpBlk +public class FldSeqsInPromotedCpBlk { - public static int Main() + [Fact] + public static int TestEntryPoint() { PromotableStruct s = default; return Problem(new PromotableStruct[1]) == 2 ? 100 : 101; diff --git a/src/tests/JIT/Directed/StructPromote/FldSeqsInPromotedCpBlk.csproj b/src/tests/JIT/Directed/StructPromote/FldSeqsInPromotedCpBlk.csproj index 5d8fe225297649..377bf381b5286a 100644 --- a/src/tests/JIT/Directed/StructPromote/FldSeqsInPromotedCpBlk.csproj +++ b/src/tests/JIT/Directed/StructPromote/FldSeqsInPromotedCpBlk.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP1.cs b/src/tests/JIT/Directed/StructPromote/SP1.cs index ac8098b75ce979..ba06f3dc293f12 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1.cs +++ b/src/tests/JIT/Directed/StructPromote/SP1.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP1 +public class SP1 { // Struct in reg (2 ints) @@ -30,7 +31,8 @@ static int M(int i0, int i1) return Foo(s); // r0 <= r1, r1 <= r0 } - public static int Main() + [Fact] + public static int TestEntryPoint() { int res = M(1, 2); Console.WriteLine("M(1, 2) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP1.csproj b/src/tests/JIT/Directed/StructPromote/SP1.csproj index ea6a8f2d28c1e7..e8759697bca9b5 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP1a.cs b/src/tests/JIT/Directed/StructPromote/SP1a.cs index 5cd40d988f7679..62bf12e7b4e874 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1a.cs +++ b/src/tests/JIT/Directed/StructPromote/SP1a.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP1a +public class SP1a { // Struct in reg (2 ints) @@ -30,7 +31,8 @@ static int M(int i0, int i1, int i2) return Foo(i0, s); // r0 <= r0; r1 <= r2; r2 <= r1 } - public static int Main() + [Fact] + public static int TestEntryPoint() { int res = M(1, 2, 3); Console.WriteLine("M(1, 2, 3) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP1a.csproj b/src/tests/JIT/Directed/StructPromote/SP1a.csproj index b3f734ac70df92..d458d2e50a43e4 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1a.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP1a.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP1a2.cs b/src/tests/JIT/Directed/StructPromote/SP1a2.cs index 89f2227b101f0e..adea9bf87375a6 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1a2.cs +++ b/src/tests/JIT/Directed/StructPromote/SP1a2.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP1a2 +public class SP1a2 { // Struct in reg (2 ints) @@ -30,7 +31,8 @@ static int M(int i0, int i1, int i2, int i3) return Foo(i0, s, i3); } - public static int Main() + [Fact] + public static int TestEntryPoint() { int res = M(1, 2, 3, 4); Console.WriteLine("M(1, 2, 3, 4) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP1a2.csproj b/src/tests/JIT/Directed/StructPromote/SP1a2.csproj index 44b5b7e3c9eed0..ae46b7e6cc3ca0 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1a2.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP1a2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP1b.cs b/src/tests/JIT/Directed/StructPromote/SP1b.cs index 0d9bcc91de6688..ba6ba924a97207 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1b.cs +++ b/src/tests/JIT/Directed/StructPromote/SP1b.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP1b +public class SP1b { // Struct in reg (2 ints) @@ -30,7 +31,8 @@ static int M(int i0, int i1, int i2, int i3) return Foo(i1, i0, s); // r0 <= r1; r1 <= r0; r2 <= r3; r3 <= r2 } - public static int Main() + [Fact] + public static int TestEntryPoint() { int res = M(1, 2, 3, 4); Console.WriteLine("M(1, 2, 3, 4) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP1b.csproj b/src/tests/JIT/Directed/StructPromote/SP1b.csproj index 0ba34ad78473ae..a3c743048d377a 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1b.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP1b.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP1c.cs b/src/tests/JIT/Directed/StructPromote/SP1c.cs index 1b833128c17248..c6513507115fe6 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1c.cs +++ b/src/tests/JIT/Directed/StructPromote/SP1c.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP1c +public class SP1c { // Struct in reg (2 ints) @@ -30,7 +31,8 @@ static int M(int i0, int i1, int i2, int i3, int i4) return Foo(i1, i0, i4, s); // r0 <= r1; r1 <= r0; r2 <= inarg[0]; r3 <= r3; outarg[0] <= r2 } - public static int Main() + [Fact] + public static int TestEntryPoint() { int res = M(2, 3, 4, 5, 1); Console.WriteLine("M(2, 3, 4, 5, 1) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP1c.csproj b/src/tests/JIT/Directed/StructPromote/SP1c.csproj index de084fec44a8c9..58c2a081e5479c 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1c.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP1c.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP1d.cs b/src/tests/JIT/Directed/StructPromote/SP1d.cs index ff357aed5c2df3..4e5e51f86fd86b 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1d.cs +++ b/src/tests/JIT/Directed/StructPromote/SP1d.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP1d +public class SP1d { // Struct in reg (2 ints) @@ -31,7 +32,8 @@ static int M(int i0, int i1, int i2, int i3, int i4, int i5, int i6) // outarg[0] <= inarg[8]; outarg[4] <= r3; outarg[8] <= r2 } - public static int Main() + [Fact] + public static int TestEntryPoint() { int res = M(4, 5, 6, 7, 3, 2, 1); Console.WriteLine("M(4, 5, 6, 7, 3, 2, 1) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP1d.csproj b/src/tests/JIT/Directed/StructPromote/SP1d.csproj index 47db151e662a6e..c307326963f98d 100644 --- a/src/tests/JIT/Directed/StructPromote/SP1d.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP1d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP2.cs b/src/tests/JIT/Directed/StructPromote/SP2.cs index afe96038b705da..e9d49ee9faae0a 100644 --- a/src/tests/JIT/Directed/StructPromote/SP2.cs +++ b/src/tests/JIT/Directed/StructPromote/SP2.cs @@ -5,8 +5,9 @@ #define USE_STRUCT using System.Runtime.CompilerServices; using System; +using Xunit; -class SP2 +public class SP2 { #if USE_STRUCT @@ -43,7 +44,8 @@ static long M(long l0, int i1) #endif } - public static int Main() + [Fact] + public static int TestEntryPoint() { long res = M(1, 2); Console.WriteLine("M(1, 2) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP2.csproj b/src/tests/JIT/Directed/StructPromote/SP2.csproj index 8ba11c61cc3d28..e4b9e0aacf2085 100644 --- a/src/tests/JIT/Directed/StructPromote/SP2.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP2a.cs b/src/tests/JIT/Directed/StructPromote/SP2a.cs index d0189d8581a530..5d49aecac3ccb4 100644 --- a/src/tests/JIT/Directed/StructPromote/SP2a.cs +++ b/src/tests/JIT/Directed/StructPromote/SP2a.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP2a +public class SP2a { // Struct in reg (long, int) @@ -30,7 +31,8 @@ static long M(long l0, int i1, int i2) return Foo(i2, s); // r0 <= r3; r2/r3 <= r0/r1; outarg[0] <= r3 } - public static int Main() + [Fact] + public static int TestEntryPoint() { long res = M(2, 3, 1); Console.WriteLine("M(2, 3, 1) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP2a.csproj b/src/tests/JIT/Directed/StructPromote/SP2a.csproj index 89e5304fb7c776..a3aa67b5dc215b 100644 --- a/src/tests/JIT/Directed/StructPromote/SP2a.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP2a.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP2b.cs b/src/tests/JIT/Directed/StructPromote/SP2b.cs index 16126f7716d585..263f6001100ebe 100644 --- a/src/tests/JIT/Directed/StructPromote/SP2b.cs +++ b/src/tests/JIT/Directed/StructPromote/SP2b.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP2b +public class SP2b { // Struct in reg (int, long) @@ -30,7 +31,8 @@ static long M(long l0, int i1, int i2) return Foo(i2, s); // r0 <= r3; r2 <= r2; outarg[0/4] <= r0/r1; } - public static int Main() + [Fact] + public static int TestEntryPoint() { long res = M(2, 3, 1); Console.WriteLine("M(2, 3, 1) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP2b.csproj b/src/tests/JIT/Directed/StructPromote/SP2b.csproj index 221dbf44a6c25c..1ba999d089f709 100644 --- a/src/tests/JIT/Directed/StructPromote/SP2b.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP2b.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SP2c.cs b/src/tests/JIT/Directed/StructPromote/SP2c.cs index 253f96dfa09bfb..394eaa0982081a 100644 --- a/src/tests/JIT/Directed/StructPromote/SP2c.cs +++ b/src/tests/JIT/Directed/StructPromote/SP2c.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SP2c +public class SP2c { // Struct in reg (int, long) @@ -30,7 +31,8 @@ static long M(long l0, long l1, int i1, int i2) return Foo(i2, l0, s); // r0 <= inarg[4]; r2/r3 <= r0/r1; outarg[0] <= inarg[0]; outarg[8/12] <= r2/r3 } - public static int Main() + [Fact] + public static int TestEntryPoint() { long res = M(4, 2, 3, 1); Console.WriteLine("M(4, 2, 3, 1) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SP2c.csproj b/src/tests/JIT/Directed/StructPromote/SP2c.csproj index 0e0deab0f1c693..46482d30cd57fa 100644 --- a/src/tests/JIT/Directed/StructPromote/SP2c.csproj +++ b/src/tests/JIT/Directed/StructPromote/SP2c.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SpAddr.cs b/src/tests/JIT/Directed/StructPromote/SpAddr.cs index 4987b2c2237c7f..b9fa68710da733 100644 --- a/src/tests/JIT/Directed/StructPromote/SpAddr.cs +++ b/src/tests/JIT/Directed/StructPromote/SpAddr.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SpAddr +public class SpAddr { // Struct in reg (2 ints) @@ -34,7 +35,8 @@ static int M(int i0, int i1, int i2, int i3) return Foo(s0, s1); // r0 <= r1; r1 <= r0; r2 <= r3; r3 <= r2 } - public static int Main() + [Fact] + public static int TestEntryPoint() { int res = M(1, 2, 3, 4); Console.WriteLine("M(1, 2, 3, 4) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SpAddr.csproj b/src/tests/JIT/Directed/StructPromote/SpAddr.csproj index 25b01591fe6bdb..be62fa8811f16a 100644 --- a/src/tests/JIT/Directed/StructPromote/SpAddr.csproj +++ b/src/tests/JIT/Directed/StructPromote/SpAddr.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/SpAddrAT.cs b/src/tests/JIT/Directed/StructPromote/SpAddrAT.cs index 7f4957fc7f265a..b816fb35797624 100644 --- a/src/tests/JIT/Directed/StructPromote/SpAddrAT.cs +++ b/src/tests/JIT/Directed/StructPromote/SpAddrAT.cs @@ -4,8 +4,9 @@ using System.Runtime.CompilerServices; using System; +using Xunit; -class SpAddrAT +public class SpAddrAT { // This one makes sure that we don't (independently) promote a struct local that is address-taken. @@ -41,7 +42,8 @@ static int M(int i0, int i1, int i2, int i3) return Foo(s0, s1) + x; // r0 <= &s0[0]; r1 <= &s0[4]; r2 <= r2; r3 <= r3 } - public static int Main() + [Fact] + public static int TestEntryPoint() { int res = M(1, 2, 3, 4); Console.WriteLine("M(1, 2, 3, 4) is {0}.", res); diff --git a/src/tests/JIT/Directed/StructPromote/SpAddrAT.csproj b/src/tests/JIT/Directed/StructPromote/SpAddrAT.csproj index dc5ebf0336d1f8..7228331b29aed4 100644 --- a/src/tests/JIT/Directed/StructPromote/SpAddrAT.csproj +++ b/src/tests/JIT/Directed/StructPromote/SpAddrAT.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.cs b/src/tests/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.cs index 6b6b891160cf1f..5bd09ab4d4a9ed 100644 --- a/src/tests/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.cs +++ b/src/tests/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.cs @@ -9,8 +9,9 @@ using System.Runtime.InteropServices; using System.Diagnostics; using System; +using Xunit; -class TestStructAccessThroughRef +public class TestStructAccessThroughRef { [StructLayout(LayoutKind.Explicit)] @@ -53,7 +54,8 @@ static void TestStructCasts() Debug.Assert(a.smallField == 0x7); } - static int Main() + [Fact] + public static int TestEntryPoint() { TestStructCasts(); return 100; diff --git a/src/tests/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.csproj b/src/tests/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.csproj index f3e1cbd44b4041..501217e4d86892 100644 --- a/src/tests/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.csproj +++ b/src/tests/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.cs b/src/tests/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.cs index e9050b1452e866..774e0e1f4e48dd 100644 --- a/src/tests/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.cs +++ b/src/tests/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.cs @@ -10,8 +10,9 @@ using System.Runtime.InteropServices; using System.Diagnostics; using System; +using Xunit; -class TestReadIntAsDouble +public class TestReadIntAsDouble { private struct Dec { @@ -79,7 +80,8 @@ public static void TestIntAssignment(Data d) d.x = Unsafe.As(ref p).ulo; } - static int Main() + [Fact] + public static int TestEntryPoint() { TestDoubleAssignment(default); TestIntAssignment(default); diff --git a/src/tests/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.csproj b/src/tests/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.csproj index f3e1cbd44b4041..501217e4d86892 100644 --- a/src/tests/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.csproj +++ b/src/tests/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.cs b/src/tests/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.cs index 0e7c23fa1bf298..a04a9b75b3e81c 100644 --- a/src/tests/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.cs +++ b/src/tests/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.cs @@ -10,8 +10,9 @@ using System.Runtime.InteropServices; using System.Diagnostics; using System; +using Xunit; -class TestAssignFieldsBetweenPromotedNotPromotedStructs +public class TestAssignFieldsBetweenPromotedNotPromotedStructs { struct PrimitiveStruct // a struct of single field of scalar types aligned at their natural boundary. @@ -74,7 +75,8 @@ static void TestStructCasts() Debug.Assert(c.anotherOverlappingStruct.b == 0x5); } - public static int Main() + [Fact] + public static int TestEntryPoint() { TestStructCasts(); return 100; diff --git a/src/tests/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.csproj b/src/tests/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.csproj index f3e1cbd44b4041..501217e4d86892 100644 --- a/src/tests/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.csproj +++ b/src/tests/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/TypedReference/TypedReference.cs b/src/tests/JIT/Directed/TypedReference/TypedReference.cs index a6c1a3832fd6f0..8b7c64445bea07 100644 --- a/src/tests/JIT/Directed/TypedReference/TypedReference.cs +++ b/src/tests/JIT/Directed/TypedReference/TypedReference.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public class BringUpTest_TypedReference @@ -12,7 +13,8 @@ public class BringUpTest_TypedReference const string Apple = "apple"; const string Orange = "orange"; - public static int Main() + [Fact] + public static int TestEntryPoint() { int i = Fail; F(__makeref(i)); diff --git a/src/tests/JIT/Directed/TypedReference/TypedReference.csproj b/src/tests/JIT/Directed/TypedReference/TypedReference.csproj index fe4a2822d7cab3..4ee2e5892f2252 100644 --- a/src/tests/JIT/Directed/TypedReference/TypedReference.csproj +++ b/src/tests/JIT/Directed/TypedReference/TypedReference.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/Dev10_846218.cs b/src/tests/JIT/Directed/UnrollLoop/Dev10_846218.cs index e44f57a3d12baf..5376264c695b11 100644 --- a/src/tests/JIT/Directed/UnrollLoop/Dev10_846218.cs +++ b/src/tests/JIT/Directed/UnrollLoop/Dev10_846218.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Text; using System.Runtime.CompilerServices; +using Xunit; namespace Test { @@ -30,7 +31,7 @@ public void Do(IntVec o) } } - internal class Program + public class Program { [MethodImpl(MethodImplOptions.NoInlining)] private static void Test(IDoSomething oDoesSomething) @@ -46,7 +47,8 @@ private static void Test(IDoSomething oDoesSomething) } [MethodImpl(MethodImplOptions.NoInlining)] - private static int Main() + [Fact] + public static int TestEntryPoint() { DoSomething doSomething = new DoSomething(); Test(doSomething); diff --git a/src/tests/JIT/Directed/UnrollLoop/Dev10_846218.csproj b/src/tests/JIT/Directed/UnrollLoop/Dev10_846218.csproj index a31be34ec1822f..2463d7be950749 100644 --- a/src/tests/JIT/Directed/UnrollLoop/Dev10_846218.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/Dev10_846218.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop1.cs b/src/tests/JIT/Directed/UnrollLoop/loop1.cs index 7f84ec4c72f7f4..a7f42c31c54367 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop1.cs +++ b/src/tests/JIT/Directed/UnrollLoop/loop1.cs @@ -3,9 +3,10 @@ // using System; +using Xunit; namespace A { - internal class B + public class B { public static int downBy1ge(int amount) { @@ -161,7 +162,8 @@ public static int downBy3neWrap(int amount) return sum + i; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool failed = false; diff --git a/src/tests/JIT/Directed/UnrollLoop/loop1_cs_d.csproj b/src/tests/JIT/Directed/UnrollLoop/loop1_cs_d.csproj index 5536117c44a4c4..8edb3e1b7ea679 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop1_cs_d.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop1_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop1_cs_do.csproj b/src/tests/JIT/Directed/UnrollLoop/loop1_cs_do.csproj index 325cd9be944934..d2fa0a6e8ba037 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop1_cs_do.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop1_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop1_cs_r.csproj b/src/tests/JIT/Directed/UnrollLoop/loop1_cs_r.csproj index c97a7ce9d57f4b..b46e82ce00a253 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop1_cs_r.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop1_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj b/src/tests/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj index 27b17ab5845ba5..1774292cb5b394 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop2.cs b/src/tests/JIT/Directed/UnrollLoop/loop2.cs index b60bdf9bcb1c34..90cb1e4fccf6ef 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop2.cs +++ b/src/tests/JIT/Directed/UnrollLoop/loop2.cs @@ -2,7 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -internal class A +using Xunit; +public class A { public virtual int f0(int i) { @@ -10,7 +11,7 @@ public virtual int f0(int i) } } -internal unsafe class B : A +public unsafe class B : A { public override int f0(int i) { @@ -927,7 +928,8 @@ public static int F5downBy3neWrap(int amount) return sum + i; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool failed = false; diff --git a/src/tests/JIT/Directed/UnrollLoop/loop2_cs_d.csproj b/src/tests/JIT/Directed/UnrollLoop/loop2_cs_d.csproj index b295f7b4815d0d..fc582df82089cb 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop2_cs_d.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop2_cs_d.csproj @@ -1,6 +1,7 @@ - Exe + + true false 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop2_cs_do.csproj b/src/tests/JIT/Directed/UnrollLoop/loop2_cs_do.csproj index f258008057a159..fcbd88786363bc 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop2_cs_do.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop2_cs_do.csproj @@ -1,6 +1,7 @@ - Exe + + true false 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop2_cs_r.csproj b/src/tests/JIT/Directed/UnrollLoop/loop2_cs_r.csproj index 76aa741e3579ab..4f533cb7c617c1 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop2_cs_r.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop2_cs_r.csproj @@ -1,6 +1,7 @@ - Exe + + true false 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj b/src/tests/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj index 754aa873d5b720..74e289f51ee7d8 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj @@ -1,6 +1,7 @@ - Exe + + true false 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3.il b/src/tests/JIT/Directed/UnrollLoop/loop3.il index aa87f9ccf78cbf..38a11bb2ff1da4 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop3.il +++ b/src/tests/JIT/Directed/UnrollLoop/loop3.il @@ -39,7 +39,7 @@ } // end of class A -.class private auto ansi beforefieldinit B +.class public auto ansi beforefieldinit B extends A { .method public hidebysig virtual instance int32 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3_il_d.ilproj b/src/tests/JIT/Directed/UnrollLoop/loop3_il_d.ilproj index 8e43b14392c1f2..10b22dd22d59e5 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop3_il_d.ilproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop3_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3_il_r.ilproj b/src/tests/JIT/Directed/UnrollLoop/loop3_il_r.ilproj index 9c51d20c25951a..6b39bbacbfb356 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop3_il_r.ilproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop3_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/UnrollLoop/loop4.cs b/src/tests/JIT/Directed/UnrollLoop/loop4.cs index 8010ca348d27be..311a8bb459c181 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop4.cs +++ b/src/tests/JIT/Directed/UnrollLoop/loop4.cs @@ -5,10 +5,12 @@ //Testing small for loops (less than 5) using System; +using Xunit; -internal class SmallLoop1 +public class SmallLoop1 { - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; int j; diff --git a/src/tests/JIT/Directed/UnrollLoop/loop4_cs_d.csproj b/src/tests/JIT/Directed/UnrollLoop/loop4_cs_d.csproj index 8ca2ea1677e745..b2e2b4bcf20914 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop4_cs_d.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop4_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop4_cs_do.csproj b/src/tests/JIT/Directed/UnrollLoop/loop4_cs_do.csproj index c48ce253d8e26e..ba4c262809cc05 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop4_cs_do.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop4_cs_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/UnrollLoop/loop4_cs_r.csproj b/src/tests/JIT/Directed/UnrollLoop/loop4_cs_r.csproj index 38648d1f9adb2d..cd5a508bf11724 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop4_cs_r.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop4_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj b/src/tests/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj index 457524ffa86b52..eb593923acc21d 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/UnrollLoop/loop6.cs b/src/tests/JIT/Directed/UnrollLoop/loop6.cs index 4380e0934dcf4c..30ee876353a791 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop6.cs +++ b/src/tests/JIT/Directed/UnrollLoop/loop6.cs @@ -2,13 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; internal struct VT { public float one; public double delta; public double temp; } -internal class loop6 +public class loop6 { public static int cnt; @@ -175,7 +176,8 @@ public static void f8() System.Console.WriteLine("f8 failed"); } - public static int Main() + [Fact] + public static int TestEntryPoint() { cnt = 0; f1(); diff --git a/src/tests/JIT/Directed/UnrollLoop/loop6_cs_d.csproj b/src/tests/JIT/Directed/UnrollLoop/loop6_cs_d.csproj index 0e332ebe215ff1..fc4ceaca901b3d 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop6_cs_d.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop6_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop6_cs_do.csproj b/src/tests/JIT/Directed/UnrollLoop/loop6_cs_do.csproj index 3b9871b4378e99..9aad896c7e2276 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop6_cs_do.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop6_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop6_cs_r.csproj b/src/tests/JIT/Directed/UnrollLoop/loop6_cs_r.csproj index c736c4607917db..604155bfab6215 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop6_cs_r.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop6_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj b/src/tests/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj index 67116f8c3072f7..01df7f52e2829c 100644 --- a/src/tests/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj +++ b/src/tests/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgd.cs b/src/tests/JIT/Directed/VectorABI/VectorMgdMgd.cs index 2f4a01243ca004..d6e9f48943ed3a 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgd.cs +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgd.cs @@ -5,6 +5,7 @@ using System.Runtime.Intrinsics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Xunit; // Test passing and returning HVAs (homogeneous vector aggregates) to/from managed code. // Test various sizes (including ones that exceed the limit for being treated as HVAs), @@ -1076,7 +1077,8 @@ public void doTests() } } - public static int Main() + [Fact] + public static int TestEntryPoint() { HVATests byteTests = new HVATests(); diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray.cs b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray.cs index 7d42576deb4d33..517b875bdb2e6a 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray.cs +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray.cs @@ -5,6 +5,7 @@ using System.Runtime.Intrinsics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Xunit; // Test passing and returning HVAs (homogeneous vector aggregates) to/from managed code. // Test various sizes (including ones that exceed the limit for being treated as HVAs), @@ -1083,7 +1084,8 @@ public void doTests() } } - public static int Main() + [Fact] + public static int TestEntryPoint() { HVATests byteTests = new HVATests(); diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray_r.csproj b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray_r.csproj index 0cdf279fdb2ecf..34fd1286e5e914 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray_r.csproj +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray_r.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray_ro.csproj b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray_ro.csproj index fb8fa457bab1d7..fed23a96014132 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray_ro.csproj +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdArray_ro.csproj @@ -1,7 +1,4 @@ - - Exe - True diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic.cs b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic.cs index 8db2ec9bcfff9d..7a4011ddc2d0d3 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic.cs +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic.cs @@ -5,6 +5,7 @@ using System.Runtime.Intrinsics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Xunit; // Test passing and returning HVAs (homogeneous vector aggregates) to/from managed code. // Test various sizes (including ones that exceed the limit for being treated as HVAs), @@ -1073,7 +1074,8 @@ public void doTests() } } - public static int Main() + [Fact] + public static int TestEntryPoint() { HVATests byteTests = new HVATests(); diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic_r.csproj b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic_r.csproj index 77818c1cc9aecd..30413af3755ac3 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic_r.csproj +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic_r.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic_ro.csproj b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic_ro.csproj index cab90a1a1fd887..bad61ff7d4dd07 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic_ro.csproj +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgdStatic_ro.csproj @@ -1,7 +1,4 @@ - - Exe - True diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgd_r.csproj b/src/tests/JIT/Directed/VectorABI/VectorMgdMgd_r.csproj index 5e2c2b9f5ccdb1..e7d8df2d7d81af 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgd_r.csproj +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgd_r.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj b/src/tests/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj index cf5c3f7cca7443..e2421971874227 100644 --- a/src/tests/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj +++ b/src/tests/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj @@ -1,6 +1,7 @@ - Exe + + true diff --git a/src/tests/JIT/Directed/aliasing_retbuf/aliasing_retbuf.cs b/src/tests/JIT/Directed/aliasing_retbuf/aliasing_retbuf.cs index 7374aed3e463d3..a31b9f0e097990 100644 --- a/src/tests/JIT/Directed/aliasing_retbuf/aliasing_retbuf.cs +++ b/src/tests/JIT/Directed/aliasing_retbuf/aliasing_retbuf.cs @@ -4,10 +4,12 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Xunit; public unsafe class AliasingRetBuf { - public static int Main() + [Fact] + public static int TestEntryPoint() { int failures = 0; diff --git a/src/tests/JIT/Directed/aliasing_retbuf/aliasing_retbuf.csproj b/src/tests/JIT/Directed/aliasing_retbuf/aliasing_retbuf.csproj index 3cf2777cc643db..14ea5a581c9ee5 100644 --- a/src/tests/JIT/Directed/aliasing_retbuf/aliasing_retbuf.csproj +++ b/src/tests/JIT/Directed/aliasing_retbuf/aliasing_retbuf.csproj @@ -1,6 +1,7 @@ - Exe + + true True True diff --git a/src/tests/JIT/Directed/arglist/vararg.cs b/src/tests/JIT/Directed/arglist/vararg.cs index 1292f6a161dcde..727b6eea8bf41b 100644 --- a/src/tests/JIT/Directed/arglist/vararg.cs +++ b/src/tests/JIT/Directed/arglist/vararg.cs @@ -5,10 +5,11 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using Xunit; namespace NativeVarargTest { - class VarArg + public class VarArg { //////////////////////////////////////////////////////////////////////////// // Member Variables @@ -4550,7 +4551,8 @@ static int ReportFailure(int success, string name, int old_val, int new_val) //////////////////////////////////////////////////////////////////////////// [MethodImpl(MethodImplOptions.NoInlining)] - static int Main(string[] args) + [Fact] + public static int TestEntryPoint() { int success = 100; m_testCount = 0; diff --git a/src/tests/JIT/Directed/arglist/vararg_TargetUnix.csproj b/src/tests/JIT/Directed/arglist/vararg.csproj similarity index 61% rename from src/tests/JIT/Directed/arglist/vararg_TargetUnix.csproj rename to src/tests/JIT/Directed/arglist/vararg.csproj index 3184bc6377d1e3..eb9f367f85077d 100644 --- a/src/tests/JIT/Directed/arglist/vararg_TargetUnix.csproj +++ b/src/tests/JIT/Directed/arglist/vararg.csproj @@ -1,9 +1,9 @@ - Exe + + true true - - true + $(DefineConstants);WIN32 PdbOnly diff --git a/src/tests/JIT/Directed/arglist/vararg_TargetWindows.csproj b/src/tests/JIT/Directed/arglist/vararg_TargetWindows.csproj deleted file mode 100644 index b3a74e3c4022ba..00000000000000 --- a/src/tests/JIT/Directed/arglist/vararg_TargetWindows.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - Exe - true - $(DefineConstants);WIN32 - - true - PdbOnly - - - - - - - - - - diff --git a/src/tests/JIT/Directed/array-il/_Arrayscomplex3.ilproj b/src/tests/JIT/Directed/array-il/_Arrayscomplex3.ilproj index 7fe18ed151688f..aafce5d8bd7fcd 100644 --- a/src/tests/JIT/Directed/array-il/_Arrayscomplex3.ilproj +++ b/src/tests/JIT/Directed/array-il/_Arrayscomplex3.ilproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Directed/array-il/_Arrayssimple3.ilproj b/src/tests/JIT/Directed/array-il/_Arrayssimple3.ilproj index 05b63128367c81..3a1abad04f6cca 100644 --- a/src/tests/JIT/Directed/array-il/_Arrayssimple3.ilproj +++ b/src/tests/JIT/Directed/array-il/_Arrayssimple3.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/array-il/complex3.il b/src/tests/JIT/Directed/array-il/complex3.il index efaf0fcade1b56..1e30429f93ef50 100644 --- a/src/tests/JIT/Directed/array-il/complex3.il +++ b/src/tests/JIT/Directed/array-il/complex3.il @@ -9,7 +9,7 @@ .assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly complex3 +.assembly '_Arrayscomplex3' { } @@ -39,7 +39,7 @@ } // end of class 'Yak' -.class auto ansi Complex2_Array_Test +.class public auto ansi Complex2_Array_Test { .method public static int32 TestRank(value class Yak[,,,,,,] Odd_Variable) il managed { diff --git a/src/tests/JIT/Directed/array-il/simple3.il b/src/tests/JIT/Directed/array-il/simple3.il index 2696dd5bcb0d97..3a8b5d3227295f 100644 --- a/src/tests/JIT/Directed/array-il/simple3.il +++ b/src/tests/JIT/Directed/array-il/simple3.il @@ -8,11 +8,11 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly simple3 +.assembly '_Arrayssimple3' { } -.class auto ansi Simple2_Array_Test +.class public auto ansi Simple2_Array_Test { .method public static int32 test(int32[,,,] Odd_Variable) il managed { diff --git a/src/tests/JIT/Directed/callconv/CdeclMemberFunction/CdeclMemberFunctionTest.cs b/src/tests/JIT/Directed/callconv/CdeclMemberFunction/CdeclMemberFunctionTest.cs index cd778e1756b87a..e1007c544290ab 100644 --- a/src/tests/JIT/Directed/callconv/CdeclMemberFunction/CdeclMemberFunctionTest.cs +++ b/src/tests/JIT/Directed/callconv/CdeclMemberFunction/CdeclMemberFunctionTest.cs @@ -63,9 +63,10 @@ public enum E : uint public static extern CLong GetWidthAsLongFromManaged(C* c); } -unsafe class CdeclMemberFunctionTest +public unsafe class CdeclMemberFunctionTest { - public static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/callconv/CdeclMemberFunction/CdeclMemberFunctionTest.csproj b/src/tests/JIT/Directed/callconv/CdeclMemberFunction/CdeclMemberFunctionTest.csproj index 6c5290aa511b56..00eaa467d6d71d 100644 --- a/src/tests/JIT/Directed/callconv/CdeclMemberFunction/CdeclMemberFunctionTest.csproj +++ b/src/tests/JIT/Directed/callconv/CdeclMemberFunction/CdeclMemberFunctionTest.csproj @@ -1,6 +1,7 @@ - Exe + + true true @@ -8,6 +9,6 @@ - + diff --git a/src/tests/JIT/Directed/callconv/PlatformDefaultMemberFunction/PlatformDefaultMemberFunctionTest.cs b/src/tests/JIT/Directed/callconv/PlatformDefaultMemberFunction/PlatformDefaultMemberFunctionTest.cs index 9a029e58deb9c4..c857a5a6dca420 100644 --- a/src/tests/JIT/Directed/callconv/PlatformDefaultMemberFunction/PlatformDefaultMemberFunctionTest.cs +++ b/src/tests/JIT/Directed/callconv/PlatformDefaultMemberFunction/PlatformDefaultMemberFunctionTest.cs @@ -63,9 +63,10 @@ public enum E : uint public static extern CLong GetWidthAsLongFromManaged(C* c); } -unsafe class PlatformDefaultMemberFunctionTest +public unsafe class PlatformDefaultMemberFunctionTest { - public static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/callconv/PlatformDefaultMemberFunction/PlatformDefaultMemberFunctionTest.csproj b/src/tests/JIT/Directed/callconv/PlatformDefaultMemberFunction/PlatformDefaultMemberFunctionTest.csproj index 6c5290aa511b56..00eaa467d6d71d 100644 --- a/src/tests/JIT/Directed/callconv/PlatformDefaultMemberFunction/PlatformDefaultMemberFunctionTest.csproj +++ b/src/tests/JIT/Directed/callconv/PlatformDefaultMemberFunction/PlatformDefaultMemberFunctionTest.csproj @@ -1,6 +1,7 @@ - Exe + + true true @@ -8,6 +9,6 @@ - + diff --git a/src/tests/JIT/Directed/callconv/StdCallMemberFunction/StdCallMemberFunctionTest.cs b/src/tests/JIT/Directed/callconv/StdCallMemberFunction/StdCallMemberFunctionTest.cs index 48fd229c66e38f..a2efa453a78b5a 100644 --- a/src/tests/JIT/Directed/callconv/StdCallMemberFunction/StdCallMemberFunctionTest.cs +++ b/src/tests/JIT/Directed/callconv/StdCallMemberFunction/StdCallMemberFunctionTest.cs @@ -63,9 +63,10 @@ public enum E : uint public static extern CLong GetWidthAsLongFromManaged(C* c); } -unsafe class StdCallMemberFunctionTest +public unsafe class StdCallMemberFunctionTest { - public static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/callconv/StdCallMemberFunction/StdCallMemberFunctionTest.csproj b/src/tests/JIT/Directed/callconv/StdCallMemberFunction/StdCallMemberFunctionTest.csproj index 6c5290aa511b56..00eaa467d6d71d 100644 --- a/src/tests/JIT/Directed/callconv/StdCallMemberFunction/StdCallMemberFunctionTest.csproj +++ b/src/tests/JIT/Directed/callconv/StdCallMemberFunction/StdCallMemberFunctionTest.csproj @@ -1,6 +1,7 @@ - Exe + + true true @@ -8,6 +9,6 @@ - + diff --git a/src/tests/JIT/Directed/callconv/ThisCall/EmptyThisCallTest.cs b/src/tests/JIT/Directed/callconv/ThisCall/EmptyThisCallTest.cs index dc24a4ed76f382..835c300c862653 100644 --- a/src/tests/JIT/Directed/callconv/ThisCall/EmptyThisCallTest.cs +++ b/src/tests/JIT/Directed/callconv/ThisCall/EmptyThisCallTest.cs @@ -14,9 +14,10 @@ unsafe class ThisCallNative public static extern int ThisCallWithEmptySignature(); } -unsafe class EmptyThisCallTest +public unsafe class EmptyThisCallTest { - public static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/callconv/ThisCall/EmptyThisCallTest.csproj b/src/tests/JIT/Directed/callconv/ThisCall/EmptyThisCallTest.csproj index 5bfd93deb062ec..38f044d738e46a 100644 --- a/src/tests/JIT/Directed/callconv/ThisCall/EmptyThisCallTest.csproj +++ b/src/tests/JIT/Directed/callconv/ThisCall/EmptyThisCallTest.csproj @@ -1,6 +1,7 @@ - Exe + + true true @@ -8,6 +9,6 @@ - + diff --git a/src/tests/JIT/Directed/callconv/ThisCall/ThisCallTest.cs b/src/tests/JIT/Directed/callconv/ThisCall/ThisCallTest.cs index 04c87e1ea2d137..f69bc693d9b3f4 100644 --- a/src/tests/JIT/Directed/callconv/ThisCall/ThisCallTest.cs +++ b/src/tests/JIT/Directed/callconv/ThisCall/ThisCallTest.cs @@ -76,9 +76,10 @@ public enum E : uint public static extern CLong GetWidthAsLongFromManaged(C* c); } -unsafe class ThisCallTest +public unsafe class ThisCallTest { - public static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/callconv/ThisCall/ThisCallTest.csproj b/src/tests/JIT/Directed/callconv/ThisCall/ThisCallTest.csproj index 5bfd93deb062ec..38f044d738e46a 100644 --- a/src/tests/JIT/Directed/callconv/ThisCall/ThisCallTest.csproj +++ b/src/tests/JIT/Directed/callconv/ThisCall/ThisCallTest.csproj @@ -1,6 +1,7 @@ - Exe + + true true @@ -8,6 +9,6 @@ - + diff --git a/src/tests/JIT/Directed/cmov/Bool_And_Op.cs b/src/tests/JIT/Directed/cmov/Bool_And_Op.cs index 9cb09a09127d94..3052e13e62a488 100644 --- a/src/tests/JIT/Directed/cmov/Bool_And_Op.cs +++ b/src/tests/JIT/Directed/cmov/Bool_And_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static bool static_field_bool; static bool sfb_false; @@ -20306,7 +20307,8 @@ static int Sub_Funclet_460() if (ab_false[index] && ab_false[index] ? ab_false[index] : ab_false[index]) True_Sum++; else False_Sum++; return (True_Sum * 2) - False_Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj index af5be141a95273..a5f6477d38dba7 100644 --- a/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj index c5ae67f62f29c5..3e46d2c0cdcc53 100644 --- a/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj index 1d2e5407ce7211..6ed9a17ddebf01 100644 --- a/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj index dbe95367546a63..264f70be0cd6c3 100644 --- a/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_No_Op.cs b/src/tests/JIT/Directed/cmov/Bool_No_Op.cs index 13ec2dfb7e5107..7850d34aa2514e 100644 --- a/src/tests/JIT/Directed/cmov/Bool_No_Op.cs +++ b/src/tests/JIT/Directed/cmov/Bool_No_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static bool static_field_bool; static bool sfb_false; @@ -891,7 +892,8 @@ static int Sub_Funclet_3() return (True_Sum * 2) - False_Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj index ad1b9db1b1a1a0..2141a43d9c973b 100644 --- a/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj index 91edbb202c72fe..b774f6104d49e6 100644 --- a/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj index bcbe9c14869f38..fa9099a0f72950 100644 --- a/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj index 9cd020d12723f5..649ac0e078c85c 100644 --- a/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_Or_Op.cs b/src/tests/JIT/Directed/cmov/Bool_Or_Op.cs index 66822717a5c2eb..ad4f2eed1f5f12 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Or_Op.cs +++ b/src/tests/JIT/Directed/cmov/Bool_Or_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static bool static_field_bool; static bool sfb_false; @@ -20306,7 +20307,8 @@ static int Sub_Funclet_460() if (ab_false[index] || ab_false[index] ? ab_false[index] : ab_false[index]) True_Sum++; else False_Sum++; return (True_Sum * 2) - False_Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj index 4c5702a2f6e0bc..977a54a1c5fa76 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj index e59d12f08e6056..40997ab6cef48e 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj index 1b878581b77208..2c51752626eb94 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj index b46c59cd677c0e..d7de7118a90aa1 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_Xor_Op.cs b/src/tests/JIT/Directed/cmov/Bool_Xor_Op.cs index c9a1c5f9a870ca..7fc44dc60af1f9 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Xor_Op.cs +++ b/src/tests/JIT/Directed/cmov/Bool_Xor_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static bool static_field_bool; static bool sfb_false; @@ -20306,7 +20307,8 @@ static int Sub_Funclet_460() if (ab_false[index] ^ ab_false[index] ? ab_false[index] : ab_false[index]) True_Sum++; else False_Sum++; return (True_Sum * 2) - False_Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj index ba950f2809c42b..47cc57cb6f234b 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj index 9eb33d71596e9d..3ea2e730222c31 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj index d4ed3b89f94683..174c12293614c0 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj index 9e4b02fdb7d6c8..7b1f0cd7728818 100644 --- a/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_And_Op.cs b/src/tests/JIT/Directed/cmov/Double_And_Op.cs index f9f2c48c44fb00..6f6ef4ee08ea43 100644 --- a/src/tests/JIT/Directed/cmov/Double_And_Op.cs +++ b/src/tests/JIT/Directed/cmov/Double_And_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static double static_field_double; static bool sfb_false; @@ -21689,7 +21690,8 @@ static double Sub_Funclet_460() Sum += (ab_false[index] && ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { double Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Double_And_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Double_And_Op_cs_d.csproj index 5457c68a5dd698..9b275006c89e77 100644 --- a/src/tests/JIT/Directed/cmov/Double_And_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Double_And_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_And_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Double_And_Op_cs_do.csproj index 58a30e9c1e59a4..2d5e79e90896b2 100644 --- a/src/tests/JIT/Directed/cmov/Double_And_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Double_And_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_And_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Double_And_Op_cs_r.csproj index 3d991aeb5ed787..5c7c3d39297d4e 100644 --- a/src/tests/JIT/Directed/cmov/Double_And_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Double_And_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj index 974639545dc2ab..4399e30c012bd6 100644 --- a/src/tests/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_No_Op.cs b/src/tests/JIT/Directed/cmov/Double_No_Op.cs index 7b36c8265a3304..8fbf122a74e67c 100644 --- a/src/tests/JIT/Directed/cmov/Double_No_Op.cs +++ b/src/tests/JIT/Directed/cmov/Double_No_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static double static_field_double; static bool sfb_false; @@ -1847,7 +1848,8 @@ static double Sub_Funclet_38() Sum += (ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { double Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Double_No_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Double_No_Op_cs_d.csproj index cf4967b13b039c..1a886c28e41d7b 100644 --- a/src/tests/JIT/Directed/cmov/Double_No_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Double_No_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_No_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Double_No_Op_cs_do.csproj index f85cb2cbf83ef9..49d70f7b7b1d84 100644 --- a/src/tests/JIT/Directed/cmov/Double_No_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Double_No_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_No_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Double_No_Op_cs_r.csproj index c15eaac5d362fe..f659ba5f3b439a 100644 --- a/src/tests/JIT/Directed/cmov/Double_No_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Double_No_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj index f49e87c2793665..d0e9d9c5b4e9c2 100644 --- a/src/tests/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_Or_Op.cs b/src/tests/JIT/Directed/cmov/Double_Or_Op.cs index a70731d6432287..abd89b1daef633 100644 --- a/src/tests/JIT/Directed/cmov/Double_Or_Op.cs +++ b/src/tests/JIT/Directed/cmov/Double_Or_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static double static_field_double; static bool sfb_false; @@ -21689,7 +21690,8 @@ static double Sub_Funclet_460() Sum += (ab_false[index] || ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { double Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj index 58ec62545a1c84..e58f0dd964f4c0 100644 --- a/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj index 0b4d317d93f780..911dcaeae3e262 100644 --- a/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj index 3567437b4d9b39..22c0adc63111a9 100644 --- a/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj index d881a0ea8dd7ff..2eebe37b0365e9 100644 --- a/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_Xor_Op.cs b/src/tests/JIT/Directed/cmov/Double_Xor_Op.cs index 3d904e8bf321c8..e12c6a33a6fa6e 100644 --- a/src/tests/JIT/Directed/cmov/Double_Xor_Op.cs +++ b/src/tests/JIT/Directed/cmov/Double_Xor_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static double static_field_double; static bool sfb_false; @@ -21689,7 +21690,8 @@ static double Sub_Funclet_460() Sum += (ab_false[index] ^ ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { double Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj index 99e474237d0fdf..0d0a66413aab48 100644 --- a/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj index 859d8f72798652..4bb02a74f0f5b8 100644 --- a/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj index 0b145dbd8bf6c8..90cdeab3c28748 100644 --- a/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj index 6a6d81721a7260..19dab70aafb8e7 100644 --- a/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_And_Op.cs b/src/tests/JIT/Directed/cmov/Float_And_Op.cs index b98a9eca555563..d38634551dc254 100644 --- a/src/tests/JIT/Directed/cmov/Float_And_Op.cs +++ b/src/tests/JIT/Directed/cmov/Float_And_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static float static_field_float; static bool sfb_false; @@ -21689,7 +21690,8 @@ static float Sub_Funclet_460() Sum += (ab_false[index] && ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { float Sum = 0.0F; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Float_And_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Float_And_Op_cs_d.csproj index 8e84995e644f62..5223788b048dca 100644 --- a/src/tests/JIT/Directed/cmov/Float_And_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Float_And_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_And_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Float_And_Op_cs_do.csproj index 487a44b39a2b2e..c41e7954b4b61a 100644 --- a/src/tests/JIT/Directed/cmov/Float_And_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Float_And_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_And_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Float_And_Op_cs_r.csproj index 0c08fc9590c606..23024ecbc8d0e6 100644 --- a/src/tests/JIT/Directed/cmov/Float_And_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Float_And_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj index cc70a7ad64c952..f559d66cc57b1b 100644 --- a/src/tests/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_No_Op.cs b/src/tests/JIT/Directed/cmov/Float_No_Op.cs index 5c720ea5563d5e..fe9b4709d06349 100644 --- a/src/tests/JIT/Directed/cmov/Float_No_Op.cs +++ b/src/tests/JIT/Directed/cmov/Float_No_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static float static_field_float; static bool sfb_false; @@ -1847,7 +1848,8 @@ static float Sub_Funclet_38() Sum += (ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { float Sum = 0.0F; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Float_No_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Float_No_Op_cs_d.csproj index cb18222dc74d8c..74ddd0c9d8b2fc 100644 --- a/src/tests/JIT/Directed/cmov/Float_No_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Float_No_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_No_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Float_No_Op_cs_do.csproj index 67fea06ba7d993..f38fd223f7582a 100644 --- a/src/tests/JIT/Directed/cmov/Float_No_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Float_No_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_No_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Float_No_Op_cs_r.csproj index b5d42a7adfdaa1..12d97265102ace 100644 --- a/src/tests/JIT/Directed/cmov/Float_No_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Float_No_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj index 487adf7ce7248e..81aad80e17a6c5 100644 --- a/src/tests/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_Or_Op.cs b/src/tests/JIT/Directed/cmov/Float_Or_Op.cs index 19400d77f73315..3d61a6bb15f0a5 100644 --- a/src/tests/JIT/Directed/cmov/Float_Or_Op.cs +++ b/src/tests/JIT/Directed/cmov/Float_Or_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static float static_field_float; static bool sfb_false; @@ -21689,7 +21690,8 @@ static float Sub_Funclet_460() Sum += (ab_false[index] || ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { float Sum = 0.0F; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj index df209c097af6f7..c7bb63f9f7f4ab 100644 --- a/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj index 377dc991d3cc16..ebc5bb57846135 100644 --- a/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj index 5255a35f3fe5a2..525a59c22a9ad7 100644 --- a/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj index 6dd61b285ba14e..878eee1f8daeb8 100644 --- a/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_Xor_Op.cs b/src/tests/JIT/Directed/cmov/Float_Xor_Op.cs index b375ee9b6dc5f7..5f7638918ba5ea 100644 --- a/src/tests/JIT/Directed/cmov/Float_Xor_Op.cs +++ b/src/tests/JIT/Directed/cmov/Float_Xor_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static float static_field_float; static bool sfb_false; @@ -21689,7 +21690,8 @@ static float Sub_Funclet_460() Sum += (ab_false[index] ^ ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { float Sum = 0.0F; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj index 2a7897784a48c5..8151f8a1523955 100644 --- a/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj index 4a3d3f9f38f063..095eef676db528 100644 --- a/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj index 5e9855f291804e..48786e7586fbff 100644 --- a/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj index 60d20c7d855431..eee3a3ca9b6f8e 100644 --- a/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/cmov/Int_And_Op.cs b/src/tests/JIT/Directed/cmov/Int_And_Op.cs index 736730378bbd98..4914efca4031fe 100644 --- a/src/tests/JIT/Directed/cmov/Int_And_Op.cs +++ b/src/tests/JIT/Directed/cmov/Int_And_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static int static_field_int; static bool sfb_false; @@ -21689,7 +21690,8 @@ static int Sub_Funclet_460() Sum += (ab_false[index] && ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Int_And_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Int_And_Op_cs_d.csproj index 4ef555c88be59e..9a2e447d9fba8f 100644 --- a/src/tests/JIT/Directed/cmov/Int_And_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Int_And_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_And_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Int_And_Op_cs_do.csproj index 3ee5da6ccac77b..b862798a71cc3f 100644 --- a/src/tests/JIT/Directed/cmov/Int_And_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Int_And_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_And_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Int_And_Op_cs_r.csproj index e05c665af4ff78..a69d13c3e8b9f0 100644 --- a/src/tests/JIT/Directed/cmov/Int_And_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Int_And_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj index 325cc2277a980d..96a402a70b3c07 100644 --- a/src/tests/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_No_Op.cs b/src/tests/JIT/Directed/cmov/Int_No_Op.cs index b0b15823f51273..bc829fc2400e4b 100644 --- a/src/tests/JIT/Directed/cmov/Int_No_Op.cs +++ b/src/tests/JIT/Directed/cmov/Int_No_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static int static_field_int; static bool sfb_false; @@ -1847,7 +1848,8 @@ static int Sub_Funclet_38() Sum += (ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Int_No_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Int_No_Op_cs_d.csproj index 6428a45f87d0d2..d79dd1fa9d4247 100644 --- a/src/tests/JIT/Directed/cmov/Int_No_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Int_No_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_No_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Int_No_Op_cs_do.csproj index 0ec8f8dcc091b5..20a7884388807c 100644 --- a/src/tests/JIT/Directed/cmov/Int_No_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Int_No_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_No_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Int_No_Op_cs_r.csproj index 759a1bfb7bdd5d..08724e921ceadf 100644 --- a/src/tests/JIT/Directed/cmov/Int_No_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Int_No_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj index c7c89fd8c4bd21..1c3c2d0d45dea5 100644 --- a/src/tests/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_Or_Op.cs b/src/tests/JIT/Directed/cmov/Int_Or_Op.cs index 2f1e9fcd025b9d..c49f6028124efe 100644 --- a/src/tests/JIT/Directed/cmov/Int_Or_Op.cs +++ b/src/tests/JIT/Directed/cmov/Int_Or_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static int static_field_int; static bool sfb_false; @@ -21689,7 +21690,8 @@ static int Sub_Funclet_460() Sum += (ab_false[index] || ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj index 16adaa8f142930..599b6160215a27 100644 --- a/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj index 3542cd056a9bae..ec54149065d86d 100644 --- a/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj index 8d039df1697189..79c55e9416ca6f 100644 --- a/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj index 406bdc67c47bb0..6501523083a3de 100644 --- a/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/cmov/Int_Xor_Op.cs b/src/tests/JIT/Directed/cmov/Int_Xor_Op.cs index f8444ec26bc67a..9e74439330eae0 100644 --- a/src/tests/JIT/Directed/cmov/Int_Xor_Op.cs +++ b/src/tests/JIT/Directed/cmov/Int_Xor_Op.cs @@ -5,7 +5,8 @@ #pragma warning disable using System; -class testout1 +using Xunit; +public class testout1 { static int static_field_int; static bool sfb_false; @@ -21689,7 +21690,8 @@ static int Sub_Funclet_460() Sum += (ab_false[index] ^ ab_false[index] ? ab[index - 1] : ab[index - 1]); return Sum; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int Sum = 0; Sum += Sub_Funclet_0(); diff --git a/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj b/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj index 7a03403d6fb4bf..26ff4acbcdf732 100644 --- a/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj +++ b/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj b/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj index b642dc770fe7d7..d4ad4fbfcba69e 100644 --- a/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj +++ b/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj b/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj index 5fa40f71a17991..ae99354d2c5e3d 100644 --- a/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj +++ b/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj b/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj index 4ee5cd90199bf0..339467ccd42d9b 100644 --- a/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj +++ b/src/tests/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il index 9034e93113b5de..69b03767cdf2e7 100644 --- a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il +++ b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il @@ -8,10 +8,10 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern mscorlib {} .assembly extern common {} -.assembly test {} -.module test.exe +.assembly 'FilterToHandler' {} .method public static int32 MoveBetweenFilterAndHandler() { .maxstack 2 @@ -54,7 +54,11 @@ done2: } -.method static int32 Main() { +.class public auto ansi FilterToHandler { +.method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .maxstack 20 .try @@ -79,3 +83,4 @@ FAIL: ldc.i4.0 ret } +} diff --git a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.ilproj b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.ilproj index bf09c960771e18..e9c2a8c03a23ad 100644 --- a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.ilproj +++ b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.cs b/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.cs index 22316838efbf25..e36052a671cd56 100644 --- a/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.cs +++ b/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license.using System; using System; +using Xunit; public class TestClass13 { @@ -11,7 +12,8 @@ public void Method0() { Console.WriteLine(); } - public static int Main() + [Fact] + public static int TestEntryPoint() { TestClass13 objTestClass13 = new TestClass13(); objTestClass13.Method0(); diff --git a/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.csproj b/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.csproj index ddf15f10604878..30dd6c657ca70b 100644 --- a/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.csproj +++ b/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.csproj @@ -1,6 +1,7 @@ - Exe + + true None diff --git a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly.cs b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly.cs index cb5d95dcf596d0..0b0190018c8ad0 100644 --- a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly.cs +++ b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly.cs @@ -3,11 +3,13 @@ // using System; -internal class Test_xaddmuly +using Xunit; +public class Test_xaddmuly { static public float x = 0x8000; static public float y = 0xF; - public static int Main() + [Fact] + public static int TestEntryPoint() { x += y * x; x += y * x; diff --git a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj index 3493e897834a6b..c7074b8e6d70af 100644 --- a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj index 18b9f1f454da3c..e724264fb4ef35 100644 --- a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj index 6d42c779dfd70d..1c43546f181ba1 100644 --- a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj index 19f8d02fd91f11..fe3abb5b4f0419 100644 --- a/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally.il index e136025b21e000..d226111edb8109 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally.il @@ -1,4 +1,5 @@ .assembly extern mscorlib {} +.assembly extern xunit.core {} .assembly badendfinally { } .method public static int32 f() noinlining { @@ -6,8 +7,12 @@ endfinally ldc.i4 100 ret } +.class public auto ansi badendfinally { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -24,4 +29,5 @@ PASS: FAIL: ldc.i4 1 ret +} } \ No newline at end of file diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj index 4e3d3484d72846..2382dd1a26473b 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj index db13493c80e57e..2abab0330ab0b6 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il index fc33ce9a308cf2..ac13045b0b1477 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il @@ -4,7 +4,7 @@ .assembly extern mscorlib {} .assembly extern xunit.core {} .assembly 'badldsfld' { } -.class Test_badldsfld extends [mscorlib]System.Object +.class public Test_badldsfld extends [mscorlib]System.Object { .field int32 i .method static int32 f() diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj index 4f580ce2fbb4fe..48b2d127f48c7b 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj index a028ce10651555..39c1b0d0fcfa1b 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall.il index bfbc962a7bdadb..f5c711268ff9a9 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall.il @@ -1,4 +1,5 @@ .assembly extern mscorlib {} +.assembly extern xunit.core {} .assembly badtailcall { } .method public static int32 f() { @@ -11,8 +12,12 @@ ldc.i4 1 tail. call int32 f() ret } +.class public auto ansi badtailcall { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -30,3 +35,4 @@ PASS: ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj index 4d617170b3b31e..97dc7e3f50c9e8 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj index 3a1d6f41066656..6dad7ed0e73f43 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1.il index 2e579ca4f11156..ce49493701ab02 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1.il @@ -10,9 +10,10 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} .assembly byrefsubbyref1 { } -.class a extends [mscorlib]System.Object +.class public a extends [mscorlib]System.Object { .field static class ctest S_1 .method public static native int byrefsubbyref(class ctest& V_1, class ctest& V_2) @@ -38,6 +39,9 @@ ret } .method public static int32 main() cil managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 2 .locals init (class ctest V_1, diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj index 307216c20e6720..37f27b17db25fa 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj index 76b136128f57ec..e4e3443528f8b6 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2.il b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2.il index fdda1a03f372be..97637457258c3d 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2.il @@ -1,7 +1,7 @@ .assembly extern legacy library mscorlib {} .assembly extern xunit.core {} .assembly legacy library calli2 { } -.class private auto ansi beforefieldinit calli2 +.class public auto ansi beforefieldinit calli2 extends [mscorlib]System.Object { .field private static int32 a diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj index b84265098fa0d0..0bec008c6482e4 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj index c77909a7c58f34..d3d3202c5d5d35 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal.il index f814c3cf4f5f72..ec0b1d17b60b9c 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal.il @@ -7,6 +7,7 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} .assembly ceeillegal { } .method public static void f() @@ -14,8 +15,12 @@ .emitbyte 0xee ret } +.class public auto ansi ceeillegal { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -37,3 +42,4 @@ PASS: ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj index 1e75d0abe6b8e8..a5d7348e4df9ab 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj index a3be82f4368f94..0029b947715945 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2.il index 5e5d75a841d5dd..811df505fbfc5c 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2.il @@ -11,7 +11,7 @@ .assembly extern xunit.core {} .assembly extern legacy library mscorlib {} .assembly legacy library ldelemnullarr2 { } -.class private auto ansi beforefieldinit ldelemnullarr2 +.class public auto ansi beforefieldinit ldelemnullarr2 extends [mscorlib]System.Object { .method public hidebysig static void f() cil managed diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj index e258880770b8e0..5a88eb78ad828d 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj index cca048a5a0b7fe..57b15cef85ef8a 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4.il index d23b06edd0f378..e4f77232a4590d 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4.il @@ -10,7 +10,7 @@ .assembly extern legacy library mscorlib {} .assembly legacy library ldfldr4 { } -.class sealed private auto ansi beforefieldinit Test_ldfldr4 +.class sealed public auto ansi beforefieldinit Test_ldfldr4 extends [mscorlib]System.Object { .field private initonly float32 a diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj index 2673e0046f50b9..e3adde00b2109c 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj index 43e0dfd836835b..51e8d6b262b9ef 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1.il index 0fcae53685c333..9e38be6e269f87 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1.il @@ -11,7 +11,7 @@ .assembly extern legacy library mscorlib {} .assembly legacy library ldfldstatic1 { } -.class private auto ansi beforefieldinit ldfldstatic1 +.class public auto ansi beforefieldinit ldfldstatic1 extends [mscorlib]System.Object { .field private static int32 fld diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj index 64af908654e079..015e493e52d116 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj index a5934ed1642926..55b4329d9038ea 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt.il index 4fd81c4f78c1fb..5e888e7cfacd99 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt.il @@ -15,7 +15,7 @@ .field public int32 a } -.class private auto ansi beforefieldinit ldfldunboxedvt +.class public auto ansi beforefieldinit ldfldunboxedvt extends [mscorlib]System.Object { .method public hidebysig static void f() cil managed diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj index 57d8c1001fa2bf..6ea8d59fdc7367 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj index 1a7a5d815c0817..3f8571a33a3037 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect.il index 115838aeb2143f..9e77e2fc868ef0 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect.il @@ -1,4 +1,5 @@ .assembly extern mscorlib {} +.assembly extern xunit.core {} .assembly ldvirtftnsideeffect { } .method public static class MyTest f(class MyTest) { @@ -6,7 +7,11 @@ ldarg.0 ret } +.class public auto ansi ldvirtftnsideeffect { .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .locals (int32, class MyTest) .entrypoint .maxstack 4 @@ -31,6 +36,7 @@ FAIL: END: ret } +} .class public MyTest { .method public void f1() { diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj index ef890985f9a2a1..fb24509ed73de2 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj index 635909719cbf40..c0a4ad6b54581f 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il index a32015ef545135..fb290f83c6ea63 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il @@ -10,7 +10,7 @@ .assembly extern xunit.core {} .assembly extern legacy library mscorlib {} .assembly legacy library 'nullsdarr' { } -.class private auto ansi beforefieldinit nullsdarr +.class public auto ansi beforefieldinit nullsdarr extends [mscorlib]System.Object { .method public static void f() cil managed diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj index d78efb98d8f259..5223270db8c25b 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj index 3d6100f038d395..8e80e594e5318d 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1.il index cda1c39e1d5a7b..6c3495d2081464 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1.il @@ -2,14 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly refanytype1 { } .method public static int32 f() { ldc.i4 100 ret } +.class public auto ansi refanytype1 { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint call int32 f() mkrefany int32 @@ -18,3 +23,4 @@ pop ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj index f7d53c963a1cde..a638d4ea52be93 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj index 8bb7bbdc122618..4ea747e6fd6954 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1.il index d81771a0ca28dd..a16f7ce03898aa 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1.il @@ -11,8 +11,8 @@ .assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly legacy library stfldstatic1 { } -.class private auto ansi beforefieldinit stfldstatic1 +.assembly legacy library 'stfldstatic1_Desktop' { } +.class public auto ansi beforefieldinit stfldstatic1 extends [mscorlib]System.Object { .field private static int32 fld diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_d.ilproj similarity index 90% rename from src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj rename to src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_d.ilproj index 5e6c0d3bd0262d..fc0e0a22b74350 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_d.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_r.ilproj similarity index 91% rename from src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj rename to src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_r.ilproj index 760bd88251402c..c349c9a3efd290 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_r.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1.il index 4ba3980e4d8e52..4e72319324b673 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1.il @@ -3,7 +3,8 @@ .assembly extern legacy library mscorlib {} -.assembly subovfun1 { } +.assembly extern xunit.core {} +.assembly 'subovfun1_Desktop' { } .method public static uint32 f(uint32 arg) { ldarg.0 @@ -11,11 +12,16 @@ ldc.i4 1 sub.ovf.un ret } +.class public auto ansi subovfun1 { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint ldc.i4 101 call uint32 f(uint32) conv.i4 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_d.ilproj similarity index 90% rename from src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj rename to src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_d.ilproj index 72bc8fc5e453d5..27db7a435a6b98 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_d.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_r.ilproj similarity index 91% rename from src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj rename to src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_r.ilproj index e6ba5b137eb913..788a8819226e14 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_r.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind.il b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind.il index 7152f221b9aadd..2aa185332e6dd0 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind.il @@ -1,4 +1,5 @@ .assembly extern mscorlib {} +.assembly extern xunit.core {} .assembly volatilldind { } .method public static void f() { @@ -8,8 +9,12 @@ volatile. ldind.i4 pop ret } +.class public auto ansi volatilldind { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -26,4 +31,5 @@ ret PASS: ldc.i4 100 ret +} } \ No newline at end of file diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj index d0823a4661b935..3a019a112888c0 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj index f9dfefbb12ff6c..36a72c6a2d72a6 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind.il b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind.il index 47ced3801f2c78..b3ad96a67866d4 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind.il +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind.il @@ -1,4 +1,5 @@ .assembly extern mscorlib {} +.assembly extern xunit.core {} .assembly volatilstind { } .method public static void f() { @@ -8,8 +9,12 @@ ldc.i4 1 volatile. stind.i4 ret } +.class public auto ansi volatilstind { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -26,4 +31,5 @@ ret PASS: ldc.i4 100 ret +} } \ No newline at end of file diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj index ab64f16e22557b..e7bc3116e7a0a0 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj index b2c74b52185808..68581b6a5de115 100644 --- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/importer/badendfinally.il b/src/tests/JIT/Directed/coverage/importer/badendfinally.il index 860462950674db..36955d9d10e253 100644 --- a/src/tests/JIT/Directed/coverage/importer/badendfinally.il +++ b/src/tests/JIT/Directed/coverage/importer/badendfinally.il @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly badendfinally {} +.assembly extern xunit.core {} .assembly extern mscorlib { } .assembly extern System.Console { @@ -14,8 +15,12 @@ endfinally ldc.i4 100 ret } +.class public auto ansi badendfinally { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -33,3 +38,4 @@ FAIL: ldc.i4 1 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/badendfinally.ilproj b/src/tests/JIT/Directed/coverage/importer/badendfinally.ilproj index 57b20c8b0ea86c..38e8109c662c2e 100644 --- a/src/tests/JIT/Directed/coverage/importer/badendfinally.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/badendfinally.ilproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/coverage/importer/badtailcall.il b/src/tests/JIT/Directed/coverage/importer/badtailcall.il index defc291a97581e..5b652b4be8ee28 100644 --- a/src/tests/JIT/Directed/coverage/importer/badtailcall.il +++ b/src/tests/JIT/Directed/coverage/importer/badtailcall.il @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly badtailcall {} +.assembly extern xunit.core {} .assembly extern mscorlib { } .assembly extern System.Console { @@ -19,8 +20,12 @@ ldc.i4 1 tail. call int32 f() ret } +.class public auto ansi badtailcall { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -38,3 +43,4 @@ PASS: ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/badtailcall.ilproj b/src/tests/JIT/Directed/coverage/importer/badtailcall.ilproj index 742f083d45bb2e..adc58ab5e0b05d 100644 --- a/src/tests/JIT/Directed/coverage/importer/badtailcall.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/badtailcall.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/byrefsubbyref1.il b/src/tests/JIT/Directed/coverage/importer/byrefsubbyref1.il index eb9587c45d6b1e..3debb73bf4f621 100644 --- a/src/tests/JIT/Directed/coverage/importer/byrefsubbyref1.il +++ b/src/tests/JIT/Directed/coverage/importer/byrefsubbyref1.il @@ -2,13 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } .assembly byrefsubbyref1 {} -.class a extends [mscorlib]System.Object +.class public a extends [mscorlib]System.Object { .field static class ctest S_1 .method public static native int byrefsubbyref(class ctest& V_1, class ctest& V_2) @@ -37,6 +38,9 @@ ret } .method public static int32 main() cil managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 2 .locals init (class ctest V_1, diff --git a/src/tests/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj b/src/tests/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj index c7d31893edb1e4..1c9bcfec612d04 100644 --- a/src/tests/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/calli2.il b/src/tests/JIT/Directed/coverage/importer/calli2.il index ead260abddfef9..ca9422672a6c12 100644 --- a/src/tests/JIT/Directed/coverage/importer/calli2.il +++ b/src/tests/JIT/Directed/coverage/importer/calli2.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly legacy library calli2 {} -.class private auto ansi beforefieldinit calli2 +.class public auto ansi beforefieldinit calli2 extends [mscorlib]System.Object { .field private static int32 a diff --git a/src/tests/JIT/Directed/coverage/importer/calli2.ilproj b/src/tests/JIT/Directed/coverage/importer/calli2.ilproj index 8338c78cb9520e..2262cf230db757 100644 --- a/src/tests/JIT/Directed/coverage/importer/calli2.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/calli2.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/ceeillegal.il b/src/tests/JIT/Directed/coverage/importer/ceeillegal.il index 9c8497d2a8d023..43b028128bca96 100644 --- a/src/tests/JIT/Directed/coverage/importer/ceeillegal.il +++ b/src/tests/JIT/Directed/coverage/importer/ceeillegal.il @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) @@ -13,8 +14,12 @@ .emitbyte 0xee ret } +.class public auto ansi ceeillegal { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -36,3 +41,4 @@ PASS: ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/ceeillegal.ilproj b/src/tests/JIT/Directed/coverage/importer/ceeillegal.ilproj index 095feeaf1fa6c9..5c9e5cb503fe57 100644 --- a/src/tests/JIT/Directed/coverage/importer/ceeillegal.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/ceeillegal.ilproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/coverage/importer/ldelemnullarr2.il b/src/tests/JIT/Directed/coverage/importer/ldelemnullarr2.il index 2db8e9d868b435..acf27417a6c055 100644 --- a/src/tests/JIT/Directed/coverage/importer/ldelemnullarr2.il +++ b/src/tests/JIT/Directed/coverage/importer/ldelemnullarr2.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly legacy library ldelemnullarr2 {} -.class private auto ansi beforefieldinit ldelemnullarr2 +.class public auto ansi beforefieldinit ldelemnullarr2 extends [mscorlib]System.Object { .method public hidebysig static void f() cil managed diff --git a/src/tests/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj b/src/tests/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj index 7b6f82add294af..c7dd67dae5b3eb 100644 --- a/src/tests/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/coverage/importer/ldfldstatic1.il b/src/tests/JIT/Directed/coverage/importer/ldfldstatic1.il index ce242d362866ee..69eea4da37a72b 100644 --- a/src/tests/JIT/Directed/coverage/importer/ldfldstatic1.il +++ b/src/tests/JIT/Directed/coverage/importer/ldfldstatic1.il @@ -8,8 +8,8 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly legacy library ldfldstatic1 {} -.class private auto ansi beforefieldinit ldfldstatic1 +.assembly legacy library 'ldfldstatic1_importer' {} +.class public auto ansi beforefieldinit ldfldstatic1 extends [mscorlib]System.Object { .field private static int32 fld diff --git a/src/tests/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/ldfldstatic1_importer_il_r.ilproj similarity index 88% rename from src/tests/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj rename to src/tests/JIT/Directed/coverage/importer/ldfldstatic1_importer_il_r.ilproj index 9242c703bd3222..27d4cb828eec65 100644 --- a/src/tests/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/ldfldstatic1_importer_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/ldfldunboxedvt.il b/src/tests/JIT/Directed/coverage/importer/ldfldunboxedvt.il index 316e177d7d32ae..e777c2b1e405c8 100644 --- a/src/tests/JIT/Directed/coverage/importer/ldfldunboxedvt.il +++ b/src/tests/JIT/Directed/coverage/importer/ldfldunboxedvt.il @@ -15,7 +15,7 @@ .field public int32 a } // end of class VT -.class private auto ansi beforefieldinit ldfldunboxedvt +.class public auto ansi beforefieldinit ldfldunboxedvt extends [mscorlib]System.Object { .method public hidebysig static void f() cil managed diff --git a/src/tests/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj b/src/tests/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj index 305c686106e6c7..cff04f56206d32 100644 --- a/src/tests/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/ldvirtftnsideeffect.il b/src/tests/JIT/Directed/coverage/importer/ldvirtftnsideeffect.il index 4ac99622344b4f..10e3a243217795 100644 --- a/src/tests/JIT/Directed/coverage/importer/ldvirtftnsideeffect.il +++ b/src/tests/JIT/Directed/coverage/importer/ldvirtftnsideeffect.il @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly ldvirtftnsideeffect {} +.assembly extern xunit.core {} .assembly extern mscorlib { } .assembly extern System.Console { @@ -17,7 +18,11 @@ ret //------------------------- // Entry point - Main - //------------------------- +.class public auto ansi ldvirtftnsideeffect { .method public static int32 main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .locals (int32, class MyTest) .entrypoint .maxstack 4 @@ -42,6 +47,7 @@ FAIL: END: ret } +} // --------------------------------------------------------- // -- C L A S S -------------------------------------------- diff --git a/src/tests/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj b/src/tests/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj index 3486aaf0186a25..d8de9a40252ec1 100644 --- a/src/tests/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/nullsdarr.il b/src/tests/JIT/Directed/coverage/importer/nullsdarr.il index a9e89d3e2ad2ce..1556f8c76ea6cb 100644 --- a/src/tests/JIT/Directed/coverage/importer/nullsdarr.il +++ b/src/tests/JIT/Directed/coverage/importer/nullsdarr.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly legacy library 'nullsdarr' {} -.class private auto ansi beforefieldinit nullsdarr +.class public auto ansi beforefieldinit nullsdarr extends [mscorlib]System.Object { .method public static void f() cil managed diff --git a/src/tests/JIT/Directed/coverage/importer/nullsdarr.ilproj b/src/tests/JIT/Directed/coverage/importer/nullsdarr.ilproj index 55d75c861a7f3f..726a554d1a62d4 100644 --- a/src/tests/JIT/Directed/coverage/importer/nullsdarr.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/nullsdarr.ilproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/coverage/importer/refanytype1.il b/src/tests/JIT/Directed/coverage/importer/refanytype1.il index 147ca65818d0ce..db0e7a1222a873 100644 --- a/src/tests/JIT/Directed/coverage/importer/refanytype1.il +++ b/src/tests/JIT/Directed/coverage/importer/refanytype1.il @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern mscorlib { } +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) @@ -13,8 +14,12 @@ ldc.i4 100 ret } +.class public auto ansi refanytype1 { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint call int32 f() mkrefany int32 @@ -23,3 +28,4 @@ pop ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/refanytype1.ilproj b/src/tests/JIT/Directed/coverage/importer/refanytype1.ilproj index b13a09d8667c55..cb245123fe4c71 100644 --- a/src/tests/JIT/Directed/coverage/importer/refanytype1.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/refanytype1.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1.il b/src/tests/JIT/Directed/coverage/importer/stfldstatic1.il index 6e9d334bfcd0de..4b85a17068778a 100644 --- a/src/tests/JIT/Directed/coverage/importer/stfldstatic1.il +++ b/src/tests/JIT/Directed/coverage/importer/stfldstatic1.il @@ -8,8 +8,8 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly legacy library stfldstatic1 {} -.class private auto ansi beforefieldinit stfldstatic1 +.assembly legacy library 'stfldstatic1_importer' {} +.class public auto ansi beforefieldinit stfldstatic1 extends [mscorlib]System.Object { .field private static int32 fld diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj rename to src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_d.ilproj index e019c955436692..fec39028758496 100644 --- a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_r.ilproj similarity index 88% rename from src/tests/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj rename to src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_r.ilproj index 31ce720ba1eb96..5b86402f03485d 100644 --- a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1.il b/src/tests/JIT/Directed/coverage/importer/subovfun1.il index 94a3d0023d18d7..5b13850f453fa8 100644 --- a/src/tests/JIT/Directed/coverage/importer/subovfun1.il +++ b/src/tests/JIT/Directed/coverage/importer/subovfun1.il @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly subovfun1 {} +.assembly 'subovfun1_importer' {} .method public static uint32 f(uint32 arg) { ldarg.0 @@ -15,11 +16,16 @@ ldc.i4 1 sub.ovf.un ret } +.class public auto ansi subovfun1 { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint ldc.i4 101 call uint32 f(uint32) conv.i4 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/subovfun1_importer_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj rename to src/tests/JIT/Directed/coverage/importer/subovfun1_importer_il_d.ilproj index 36ee659d40f899..c680fe3906a22c 100644 --- a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/subovfun1_importer_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/subovfun1_importer_il_r.ilproj similarity index 88% rename from src/tests/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj rename to src/tests/JIT/Directed/coverage/importer/subovfun1_importer_il_r.ilproj index b0a578bd5196e9..fbc35244f7dece 100644 --- a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/subovfun1_importer_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/importer/volatilldind.il b/src/tests/JIT/Directed/coverage/importer/volatilldind.il index fc30c0e380ed85..5b8bc5eb52070c 100644 --- a/src/tests/JIT/Directed/coverage/importer/volatilldind.il +++ b/src/tests/JIT/Directed/coverage/importer/volatilldind.il @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly volatilldind {} +.assembly extern xunit.core {} .assembly extern mscorlib { } .assembly extern System.Console { @@ -16,8 +17,12 @@ volatile. ldind.i4 pop ret } +.class public auto ansi volatilldind { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -35,3 +40,4 @@ PASS: ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/volatilldind.ilproj b/src/tests/JIT/Directed/coverage/importer/volatilldind.ilproj index 78e1ead6e0dd5d..c380eba5a6f887 100644 --- a/src/tests/JIT/Directed/coverage/importer/volatilldind.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/volatilldind.ilproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/coverage/importer/volatilstind.il b/src/tests/JIT/Directed/coverage/importer/volatilstind.il index 5b83457785a9ea..50675f1d57c19b 100644 --- a/src/tests/JIT/Directed/coverage/importer/volatilstind.il +++ b/src/tests/JIT/Directed/coverage/importer/volatilstind.il @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly volatilstind {} +.assembly extern xunit.core {} .assembly extern mscorlib { } .assembly extern System.Console { @@ -16,8 +17,12 @@ ldc.i4 1 volatile. stind.i4 ret } +.class public auto ansi volatilstind { .method public static int32 Main() { +.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 +) .entrypoint .try { @@ -35,3 +40,4 @@ PASS: ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/coverage/importer/volatilstind.ilproj b/src/tests/JIT/Directed/coverage/importer/volatilstind.ilproj index 102d642eb1092b..97181169ff1dc8 100644 --- a/src/tests/JIT/Directed/coverage/importer/volatilstind.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/volatilstind.ilproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/coverage/oldtests/33objref.cs b/src/tests/JIT/Directed/coverage/oldtests/33objref.cs index 732b14d5a6260d..65f5cff2127451 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/33objref.cs +++ b/src/tests/JIT/Directed/coverage/oldtests/33objref.cs @@ -4,6 +4,7 @@ //testing more than 32 (>33) objref's on the stack and as function arguments using System; +using Xunit; internal class ratnl { @@ -35,9 +36,9 @@ public long p_dnm } } -internal class Test33objref +public class Test33objref { - public static ratnl f1(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a6, ratnl a7, ratnl a8, ratnl a9, ratnl a10, + private static ratnl f1(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a6, ratnl a7, ratnl a8, ratnl a9, ratnl a10, ratnl a11, ratnl a12, ratnl a13, ratnl a14, ratnl a15, ratnl a16, ratnl a17, ratnl a18, ratnl a19, ratnl a20, ratnl a21, ratnl a22, ratnl a23, ratnl a24, ratnl a25, ratnl a26, ratnl a27, ratnl a28, ratnl a29, ratnl a30, ratnl a31, ratnl a32, ratnl a33) @@ -49,7 +50,7 @@ public static ratnl f1(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a return result; } - public static long f2(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a6, ratnl a7, ratnl a8, ratnl a9, ratnl a10, + private static long f2(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a6, ratnl a7, ratnl a8, ratnl a9, ratnl a10, ratnl a11, ratnl a12, ratnl a13, ratnl a14, ratnl a15, ratnl a16, ratnl a17, ratnl a18, ratnl a19, ratnl a20, ratnl a21, ratnl a22, ratnl a23, ratnl a24, ratnl a25, ratnl a26, ratnl a27, ratnl a28, ratnl a29, ratnl a30, ratnl a31, ratnl a32, ratnl a33) @@ -60,7 +61,7 @@ public static long f2(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a6 (a33.p_nmr - a30.p_nmr) * (a31.p_nmr + a32.p_nmr); } - public static long f3(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a6, ratnl a7, ratnl a8, ratnl a9, ratnl a10, + private static long f3(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a6, ratnl a7, ratnl a8, ratnl a9, ratnl a10, ratnl a11, ratnl a12, ratnl a13, ratnl a14, ratnl a15, ratnl a16, ratnl a17, ratnl a18, ratnl a19, ratnl a20, ratnl a21, ratnl a22, ratnl a23, ratnl a24, ratnl a25, ratnl a26, ratnl a27, ratnl a28, ratnl a29, ratnl a30, ratnl a31, ratnl a32, ratnl a33) @@ -71,7 +72,7 @@ public static long f3(ratnl a1, ratnl a2, ratnl a3, ratnl a4, ratnl a5, ratnl a6 (a33.p_dnm - a30.p_dnm) * (a31.p_dnm + a32.p_dnm); } - public static long f4(ref long a1, ref long a2, ref long a3, ref long a4, ref long a5, ref long a6, ref long a7, ref long a8, ref long a9, ref long a10, + private static long f4(ref long a1, ref long a2, ref long a3, ref long a4, ref long a5, ref long a6, ref long a7, ref long a8, ref long a9, ref long a10, ref long a11, ref long a12, ref long a13, ref long a14, ref long a15, ref long a16, ref long a17, ref long a18, ref long a19, ref long a20, ref long a21, ref long a22, ref long a23, ref long a24, ref long a25, ref long a26, ref long a27, ref long a28, ref long a29, ref long a30, ref long a31, ref long a32, ref long a33) @@ -82,7 +83,8 @@ public static long f4(ref long a1, ref long a2, ref long a3, ref long a4, ref lo (a33 - a30) * (a31 + a32); } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; diff --git a/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj b/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj index 8c23ea3c52eb30..39a1dc7d88f6e6 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj b/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj index ad36ee943bbe7c..b27c9ffa502dba 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj b/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj index 68d479ff4ef709..52364497629598 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj b/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj index 7beb018cd79237..a64219d32fe765 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke.il b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke.il index e8638c4cebbd55..950bc1482b6fa6 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke.il +++ b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke.il @@ -3,6 +3,7 @@ //Testing calli with pinvoke methods .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) @@ -104,6 +105,9 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint // Method begins at RVA 0x10c0 // Code size 241 (0xf1) diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj index c6cccaafcf70c4..e1d3c6ce0a8134 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj @@ -1,6 +1,7 @@ - Exe + + true true diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj index 81f41501d4bc1e..1ce4add3416fc1 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj @@ -1,6 +1,7 @@ - Exe + + true true diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen.il b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen.il index d7d5bd9630877e..60208eb75d8da6 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen.il +++ b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen.il @@ -31,11 +31,10 @@ } // end of class X -.class private auto ansi beforefieldinit arrgetlen +.class public auto ansi beforefieldinit arrgetlen extends [mscorlib]System.Object { - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj index 2420f5a8b13a1f..a5104cf92343b4 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj index 20dca930e86e3f..5e474712538e0b 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/callipinvoke.il b/src/tests/JIT/Directed/coverage/oldtests/callipinvoke.il index 405cb8522b451b..cd1a4b15598fe4 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/callipinvoke.il +++ b/src/tests/JIT/Directed/coverage/oldtests/callipinvoke.il @@ -3,6 +3,7 @@ //Testing calli with pinvoke methods .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) @@ -102,6 +103,9 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint // Method begins at RVA 0x10c0 // Code size 241 (0xf1) diff --git a/src/tests/JIT/Directed/coverage/oldtests/callipinvoke.ilproj b/src/tests/JIT/Directed/coverage/oldtests/callipinvoke.ilproj index cf5988be166b9e..47f01a70e25179 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/callipinvoke.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/callipinvoke.ilproj @@ -1,6 +1,7 @@ - Exe + + true true diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse1.cs b/src/tests/JIT/Directed/coverage/oldtests/cse1.cs index be7eb96653ebc3..3fda448c4ee627 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse1.cs +++ b/src/tests/JIT/Directed/coverage/oldtests/cse1.cs @@ -4,6 +4,7 @@ //testing common sub-expression elimination using System; +using Xunit; public class CL { public int item; @@ -104,7 +105,8 @@ private static int DoDiv(ref int pa) return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int result; s_sa = 0; diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj b/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj index e8c1e3136611aa..e1f74b623c387b 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj b/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj index 0355dd71139f5a..5e1a402f3c2340 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj b/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj index 2fdb41cf789ab5..228bc5502f844e 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj b/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj index 934222d3bf68da..d98c4d1167e7b3 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse2.cs b/src/tests/JIT/Directed/coverage/oldtests/cse2.cs index dc9f6b67010af7..30e8c19ac581ce 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse2.cs +++ b/src/tests/JIT/Directed/coverage/oldtests/cse2.cs @@ -4,7 +4,8 @@ //Testing common sub-expression elimination in random code using System; -internal unsafe class testout1 +using Xunit; +public unsafe class testout1 { public static int sa = 2; public static int sb = 1; @@ -513,7 +514,8 @@ public static int Func_0(double[,] arr2d_0, VT_0 vt_0) return retval_0; } - public static int Main() + [Fact] + public static int TestEntryPoint() { sa = 10; sb = 5; diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj b/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj index c6c80813b226c9..7a8f48974f45fd 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj b/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj index 33173bbef1119f..ab7b35dcd363a1 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj b/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj index a934cdea87b88c..7c19ca4bab5999 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj b/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj index 0979c29f0732aa..767e58d9526ebd 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd.cs b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd.cs index e96cd7a421bb71..281d80ad36307e 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd.cs +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd.cs @@ -5,7 +5,8 @@ #pragma warning disable 0414 using System; -internal class lclfldadd +using Xunit; +public class lclfldadd { //user-defined class that overloads operator + public class numHolder @@ -248,7 +249,8 @@ private struct VT public numHolder nHldr_vt_op2; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; //initialize class diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj index 5720cee86ef667..4b075e71408a36 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj index 0e43b100880c64..fc747461a70570 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj index 8f25033d8004a0..564c8bee548dd0 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj index 5e70fddf464b30..884fe708374939 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv.cs b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv.cs index fde10f03831e10..56a77a19e65ffb 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv.cs +++ b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv.cs @@ -5,7 +5,8 @@ #pragma warning disable 0414 using System; -internal class lclflddiv +using Xunit; +public class lclflddiv { //user-defined class that overloads operator / public class numHolder @@ -248,7 +249,8 @@ private struct VT public numHolder nHldr_vt_op2; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; //initialize class diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj index 39a5b5de9bc258..f2c5a91f066e25 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj index c3f9a82e5954d1..6f3c1f28bf62e5 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj index 46fa4da2998ec5..3d2323fb7e5b0e 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj index 4fd834f0690c0b..5f84a07e4ee232 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul.cs b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul.cs index 05897322bf756e..01a693e3196cdf 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul.cs +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul.cs @@ -5,7 +5,8 @@ #pragma warning disable 0414 using System; -internal class lclfldmul +using Xunit; +public class lclfldmul { //user-defined class that overloads operator * public class numHolder @@ -248,7 +249,8 @@ private struct VT public numHolder nHldr_vt_op2; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; //initialize class diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj index 841ff273bba61f..b383a61e72232a 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj index 8358e8b4d6209b..e862465a8e237a 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj index b6662527742402..9dacde082b8a69 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj index 14efb0280aa192..49875a768f4bdc 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem.cs b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem.cs index e238abdf09e274..3cbde5da070b7f 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem.cs +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem.cs @@ -5,7 +5,8 @@ #pragma warning disable 0414 using System; -internal class lclfldrem +using Xunit; +public class lclfldrem { //user-defined class that overloads operator % public class numHolder @@ -248,7 +249,8 @@ private struct VT public numHolder nHldr_vt_op2; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; //initialize class diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj index 546f6114c3d685..4fb8858baf5c0b 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj index 3c2dca87efd5b1..0949405e77a303 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj index 33678e98862f25..778d6641858011 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj index 9b1717895fdc3b..57259f71400c00 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub.cs b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub.cs index 967516589493c2..ba50ad90cfcde4 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub.cs +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub.cs @@ -5,7 +5,8 @@ #pragma warning disable 0414 using System; -internal class lclfldsub +using Xunit; +public class lclfldsub { //user-defined class that overloads operator - public class numHolder @@ -248,7 +249,8 @@ private struct VT public numHolder nHldr_vt_op2; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; //initialize class diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj index a65072a58e2c59..6040c584844571 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj index 36b9ac24b7ab1e..5170ea4c203fc1 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj index 1dad7f78726c58..0216cbd0f75639 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj index 909706130753c2..48fa998e865418 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl.il b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl.il index a33047565415ec..235535b581753a 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl.il +++ b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl.il @@ -2,18 +2,24 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } .assembly lcliimpl {} +.class public auto ansi lcliimpl { .method public static int32 main() cil managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint call int32 f() ret } +} .method public static int32 f() cil managed { diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj index 7a86e40935fc40..4350bc3ebe2112 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj index 1213facc54d080..9cb9b69e53e95d 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il index cd43d404450441..8088ea9e9a886e 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il +++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il @@ -9,7 +9,7 @@ .assembly extern xunit.core {} .assembly extern legacy library mscorlib {} .assembly 'ldfldstatic' {} -.class private auto ansi beforefieldinit ldfldstatic +.class public auto ansi beforefieldinit ldfldstatic extends [mscorlib]System.Object { .field public static char Achar diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj index 36fc8bbbf2e3bd..c19fce5a16b165 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj index e816dda6d772f0..3bdf6a289139f1 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld.il b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld.il index a4748829f24e15..617b16ef91af37 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld.il +++ b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly ldsshrstsfld {} -.class private auto ansi beforefieldinit ldsshrstsfld +.class public auto ansi beforefieldinit ldsshrstsfld extends [mscorlib]System.Object { .field private static char c @@ -51,7 +51,7 @@ IL_0031: ret } - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj index 1b818c9249b9e9..6f91e6012581c2 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj index bd0dd659774c2c..597e8024dbb36a 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli.il b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli.il index 96b2f342330227..53e37d8c22b523 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli.il +++ b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli.il @@ -127,7 +127,7 @@ } // end of class B -.class private auto ansi beforefieldinit Test_ldvirtftncalli +.class public auto ansi beforefieldinit Test_ldvirtftncalli extends [mscorlib]System.Object { .field public static class B b1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj index 599f495d59ff09..34a01efaf4df7e 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj index ff0ef67a104b20..bbee5979d5e63b 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1.il b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1.il index 5f1476e71df7ee..413fd1fa325dbe 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1.il +++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1.il @@ -9,10 +9,10 @@ .assembly extern xunit.core {} .assembly extern mscorlib {} .assembly ovfldiv1 {} -.class private auto ansi beforefieldinit ovfldiv1 +.class public auto ansi beforefieldinit ovfldiv1 extends [mscorlib]System.Object { - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj index ba0691289abf3d..4d50aafe307765 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj index c0ef8cdf515488..eabd985ba45124 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2.il b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2.il index 643c45148d4ab9..2a3cae8e0a2622 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2.il +++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2.il @@ -10,10 +10,10 @@ .ver 4:0:0:0 } .assembly ovfldiv2 {} -.class private auto ansi beforefieldinit ovfldiv2 +.class public auto ansi beforefieldinit ovfldiv2 extends [mscorlib]System.Object { - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj index 3ec424b4e70a43..0d5c1cfa8e268a 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj index 4654df112ed2d9..9c3dd7130e7cc2 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1.il b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1.il index a8825276528e5b..53340aa1c992f9 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1.il +++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1.il @@ -9,10 +9,10 @@ .assembly extern xunit.core {} .assembly extern mscorlib {} .assembly ovflrem1 {} -.class private auto ansi beforefieldinit ovflrem1 +.class public auto ansi beforefieldinit ovflrem1 extends [mscorlib]System.Object { - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj index 2e95320cc5e948..2157aa05a5ba5c 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj index 429afeb43e91a0..5687fd1819d197 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2.il b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2.il index e9e1f33e26e04c..2c2fd0899a8c6a 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2.il +++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2.il @@ -10,10 +10,10 @@ .ver 4:0:0:0 } .assembly ovflrem2 {} -.class private auto ansi beforefieldinit ovflrem2 +.class public auto ansi beforefieldinit ovflrem2 extends [mscorlib]System.Object { - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj index 1d2a5b25dbf99a..631256f798c31c 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj index 3f877a1d2a322c..94dad56a1bb447 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1.il b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1.il index 34c410261ee0ba..a3a8bf70858c48 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1.il +++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1.il @@ -9,8 +9,8 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly stfldstatic1 {} -.class private auto ansi beforefieldinit stfldstatic1 +.assembly 'stfldstatic1_oldtests' {} +.class public auto ansi beforefieldinit stfldstatic1 extends [mscorlib]System.Object { .field private static int32 s1 @@ -25,7 +25,7 @@ .field private static valuetype [mscorlib]System.Decimal s10 .field private static string s11 .field private int32 a - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj rename to src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_d.ilproj index e019c955436692..fec39028758496 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_r.ilproj similarity index 90% rename from src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj rename to src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_r.ilproj index cf4b4bffcb76d9..8a995fdc2e1fde 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2.il b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2.il index b6e1fffc31cb69..be1b5018b0dfb7 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2.il +++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2.il @@ -10,7 +10,7 @@ .ver 4:0:0:0 } .assembly stfldstatic2 {} -.class private auto ansi beforefieldinit stfldstatic2 +.class public auto ansi beforefieldinit stfldstatic2 extends [mscorlib]System.Object { .field private static int32 s1 @@ -25,7 +25,7 @@ .field private static valuetype [mscorlib]System.Decimal s10 .field private static string s11 .field private int32 a - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj index ee420c74357c9e..7283e729df9cfb 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj index cdfee456638a00..dc628aa1154e7d 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref.il b/src/tests/JIT/Directed/coverage/oldtests/subbyref.il index e12abb04248e94..4fbf54c1a3c846 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/subbyref.il +++ b/src/tests/JIT/Directed/coverage/oldtests/subbyref.il @@ -8,17 +8,21 @@ .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } .assembly subbyref {} -.class a extends [mscorlib]System.Object +.class public a extends [mscorlib]System.Object { .field static class ctest S_1 .method public static int32 main() cil managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 2 .locals init (class ctest V_1, diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj index 8ae7a51df6385a..684da5733a393a 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj index 3a1f5e8e5644b5..fb227705922853 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il index 84febf17680c12..baad71496097d6 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il @@ -9,10 +9,10 @@ .ver 4:0:0:0 } .assembly switchdefaultonly1 {} -.class private auto ansi beforefieldinit switchdefaultonly1 +.class public auto ansi beforefieldinit switchdefaultonly1 extends [mscorlib]System.Object { - .method private hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -21,7 +21,8 @@ // Code size 49 (0x31) .maxstack 2 .locals init (int32 V_0) - IL_0000: ldarg.0 + ldc.i4.s 0 + IL_0000: newarr [mscorlib]System.String IL_0001: ldlen IL_0002: conv.i4 IL_0003: stloc.0 @@ -29,8 +30,9 @@ IL_0005: ldc.i4.1 IL_0006: sub IL_0007: switch (IL_0014) - IL_0014: br.s IL_0026 - IL_0026: ldarg.0 + IL_0014: br.s IL_0025 + IL_0025: ldc.i4.s 0 + IL_0026: newarr [mscorlib]System.String IL_0027: ldlen IL_0028: conv.i4 IL_0029: call void [System.Console]System.Console::WriteLine(int32) diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj index ef2213d4d9ecbf..5e1345a9a7b925 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj index 59075cf3b2d12a..10320d32a77a90 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il index 89c700237f4abe..5737d8a97c19a9 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il @@ -9,10 +9,10 @@ .ver 4:0:0:0 } .assembly 'switchdefaultonly2' {} -.class private auto ansi beforefieldinit switchdefaultonly1 +.class public auto ansi beforefieldinit switchdefaultonly1 extends [mscorlib]System.Object { - .method private hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -21,7 +21,8 @@ // Code size 49 (0x31) .maxstack 2 .locals init (int32 V_0) - IL_0000: ldarg.0 + ldc.i4.s 0 + IL_0000: newarr [mscorlib]System.String IL_0001: ldlen IL_0002: conv.i4 IL_0003: stloc.0 @@ -29,15 +30,15 @@ IL_0005: ldc.i4.1 IL_0006: sub IL_0007: switch (IL_0014) - IL_0014: br.s IL_0026 + IL_0014: br.s IL_0025 IL_001c: br.s IL_0030 IL_001e: ldc.i4.2 IL_001f: call void [System.Console]System.Console::WriteLine(int32) IL_0024: br.s IL_0030 - - IL_0026: ldarg.0 + IL_0025: ldc.i4.s 0 + IL_0026: newarr [mscorlib]System.String IL_0027: ldlen IL_0028: conv.i4 IL_0029: call void [System.Console]System.Console::WriteLine(int32) diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj index a6a9ac9372b4c6..f533d1495c21cb 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj index bb42967b7c8fad..eee70d7c828c80 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il index a6f55389a7a32f..e92e15de48976e 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il @@ -9,10 +9,10 @@ .ver 4:0:0:0 } .assembly 'switchdefaultonly3' {} -.class private auto ansi beforefieldinit switchdefaultonly1 +.class public auto ansi beforefieldinit switchdefaultonly1 extends [mscorlib]System.Object { - .method private hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -21,7 +21,8 @@ // Code size 49 (0x31) .maxstack 2 .locals init (int32 V_0) - IL_0000: ldarg.0 + ldc.i4.s 0 + IL_0000: newarr [mscorlib]System.String IL_0001: ldlen IL_0002: conv.i4 IL_0003: stloc.0 @@ -32,7 +33,8 @@ IL_0014: br.s IL_0026 IL_0026: .try { - ldarg.0 + ldc.i4.s 0 + newarr [mscorlib]System.String ldlen conv.i4 call void [System.Console]System.Console::WriteLine(int32) diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj index 476f70ef6b04f4..007a2b892f4e11 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj index b66a00df6c2aae..916cbccf20a67a 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest.il b/src/tests/JIT/Directed/coverage/oldtests/tlstest.il index b3d705dc85bf3d..6611b7dc4f6a85 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/tlstest.il +++ b/src/tests/JIT/Directed/coverage/oldtests/tlstest.il @@ -15,7 +15,7 @@ .assembly tlstest {} .namespace 'tls' { - .class private auto ansi beforefieldinit tlstest + .class public auto ansi beforefieldinit tlstest extends [mscorlib]System.Object { .method private hidebysig static uint8 @@ -35,8 +35,7 @@ IL_0009: ret } // end of method tlstest::f - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj index 475ecf560d1a5a..587d86267cc897 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj index 01a177a1c2d7d3..c912d84ea5ab78 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj @@ -1,6 +1,5 @@ - Exe true 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg.il b/src/tests/JIT/Directed/coverage/oldtests/trashreg.il index 1843074084e1c3..8e32cb0bfc21e8 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/trashreg.il +++ b/src/tests/JIT/Directed/coverage/oldtests/trashreg.il @@ -3,12 +3,13 @@ .assembly extern mscorlib { } +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly test {} +.assembly 'trashreg' {} .class public sealed a extends [mscorlib]System.Object { // specifying beforefieldinit here makes this sample work @@ -26,6 +27,9 @@ .method public static int32 a() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .locals init ( class [mscorlib]System.ArithmeticException V_1, diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj index 2bda7d004dba58..57c53b4b08c0e7 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj index d9ad92c6b31381..24928024038965 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj.il b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj.il index 3a2c2de5eaedcd..afe01f714294f2 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj.il +++ b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj.il @@ -12,7 +12,7 @@ .assembly volatilecpobj { } .namespace JitTest { - .class private sequential ansi sealed beforefieldinit Test + .class public sequential ansi sealed beforefieldinit Test extends [mscorlib]System.ValueType { .field private int32 m_v @@ -157,8 +157,7 @@ volatile. ldfld int32 JitTest.Test::m_v ret } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj index 40033dbf0180cc..000d602094950b 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj index 5f3882869ac544..8fddfad376d40d 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit.il b/src/tests/JIT/Directed/coverage/oldtests/zeroinit.il index ac3e75e2cd5df1..c1d31592a63ac8 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/zeroinit.il +++ b/src/tests/JIT/Directed/coverage/oldtests/zeroinit.il @@ -32,7 +32,7 @@ .field public int32 'nop' } // end of class VT -.class private auto ZeroInit +.class public auto ZeroInit { .method public hidebysig static int32 Main() cil managed { diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj index 99ce6db8df2f40..a76cdfbb36f116 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj index 97715de9c8df41..a24818adec0f58 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/debugging/debuginfo/tester.cs b/src/tests/JIT/Directed/debugging/debuginfo/tester.cs index 826efdf6b7a284..cab3472ea02497 100644 --- a/src/tests/JIT/Directed/debugging/debuginfo/tester.cs +++ b/src/tests/JIT/Directed/debugging/debuginfo/tester.cs @@ -15,10 +15,12 @@ using Tracing.Tests.Common; using DebugInfoMethodsD = tests_d::DebugInfoMethods; using DebugInfoMethodsR = tests_r::DebugInfoMethods; +using Xunit; public unsafe class DebugInfoTest { - public static unsafe int Main() + [Fact] + public static unsafe int TestEntryPoint() { var keywords = ClrTraceEventParser.Keywords.Jit | ClrTraceEventParser.Keywords.JittedMethodILToNativeMap; diff --git a/src/tests/JIT/Directed/debugging/debuginfo/tester.csproj b/src/tests/JIT/Directed/debugging/debuginfo/tester.csproj index 96fc7e75e89f17..925b9e35273de1 100644 --- a/src/tests/JIT/Directed/debugging/debuginfo/tester.csproj +++ b/src/tests/JIT/Directed/debugging/debuginfo/tester.csproj @@ -1,6 +1,7 @@ - Exe + + true PdbOnly True True diff --git a/src/tests/JIT/Directed/debugging/poisoning/poison.cs b/src/tests/JIT/Directed/debugging/poisoning/poison.cs index 9cb366119ccbdb..c5bcccded9270e 100644 --- a/src/tests/JIT/Directed/debugging/poisoning/poison.cs +++ b/src/tests/JIT/Directed/debugging/poisoning/poison.cs @@ -1,10 +1,12 @@ using System; using System.Runtime.CompilerServices; +using Xunit; public class Program { [SkipLocalsInit] - public static unsafe int Main() + [Fact] + public static unsafe int TestEntryPoint() { bool result = true; diff --git a/src/tests/JIT/Directed/debugging/poisoning/poison.csproj b/src/tests/JIT/Directed/debugging/poisoning/poison.csproj index b2691ab4cab22b..50009e3f69b2e7 100644 --- a/src/tests/JIT/Directed/debugging/poisoning/poison.csproj +++ b/src/tests/JIT/Directed/debugging/poisoning/poison.csproj @@ -1,6 +1,5 @@ - Exe PdbOnly False True diff --git a/src/tests/JIT/Directed/forceinlining/AttributeConflict.ilproj b/src/tests/JIT/Directed/forceinlining/AttributeConflict.ilproj index fb39d906115846..d9cc10fd55eb84 100644 --- a/src/tests/JIT/Directed/forceinlining/AttributeConflict.ilproj +++ b/src/tests/JIT/Directed/forceinlining/AttributeConflict.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 diff --git a/src/tests/JIT/Directed/forceinlining/LargeNumberOfArgs.cs b/src/tests/JIT/Directed/forceinlining/LargeNumberOfArgs.cs index af91f7a1d23362..8812126fe53e71 100644 --- a/src/tests/JIT/Directed/forceinlining/LargeNumberOfArgs.cs +++ b/src/tests/JIT/Directed/forceinlining/LargeNumberOfArgs.cs @@ -3,8 +3,9 @@ using System; using System.Runtime.CompilerServices; +using Xunit; -internal class My +public class My { [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] private static int sum(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15, int a16) @@ -12,7 +13,8 @@ private static int sum(int a1, int a2, int a3, int a4, int a5, int a6, int a7, i return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10 + a11 + a12 + a13 + a14 + a15 + a16; } - private static int Main() + [Fact] + public static int TestEntryPoint() { Console.WriteLine("A bug was discovered during feature development and is covered by this test."); Console.WriteLine("If this test does not crash terribly, it is assumed to have passed... :-/"); diff --git a/src/tests/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj b/src/tests/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj index 440e57beac9ae5..18d5ea87195826 100644 --- a/src/tests/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj +++ b/src/tests/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/forceinlining/NegativeCases.ilproj b/src/tests/JIT/Directed/forceinlining/NegativeCases.ilproj index 054c0f20225f2c..ba58adbd72df6e 100644 --- a/src/tests/JIT/Directed/forceinlining/NegativeCases.ilproj +++ b/src/tests/JIT/Directed/forceinlining/NegativeCases.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Directed/forceinlining/NoMetaData.cs b/src/tests/JIT/Directed/forceinlining/NoMetaData.cs index 0da36ddeb4ba21..d9f2c09f4163e8 100644 --- a/src/tests/JIT/Directed/forceinlining/NoMetaData.cs +++ b/src/tests/JIT/Directed/forceinlining/NoMetaData.cs @@ -2,10 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; public class P { - public static int Main() + [Fact] + public static int TestEntryPoint() { int[,] x = new int[5, 5]; for (int i = 0; i < 5; ++i) diff --git a/src/tests/JIT/Directed/forceinlining/NoMetaData.csproj b/src/tests/JIT/Directed/forceinlining/NoMetaData.csproj index 9db8c85c2e3213..ff234a4ab83641 100644 --- a/src/tests/JIT/Directed/forceinlining/NoMetaData.csproj +++ b/src/tests/JIT/Directed/forceinlining/NoMetaData.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/forceinlining/PositiveCases.ilproj b/src/tests/JIT/Directed/forceinlining/PositiveCases.ilproj index 350c87febe25a7..dd69027491e9f0 100644 --- a/src/tests/JIT/Directed/forceinlining/PositiveCases.ilproj +++ b/src/tests/JIT/Directed/forceinlining/PositiveCases.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 diff --git a/src/tests/JIT/Directed/forceinlining/Recursion.cs b/src/tests/JIT/Directed/forceinlining/Recursion.cs index b3a7899956ecd3..4203ce3dfa3368 100644 --- a/src/tests/JIT/Directed/forceinlining/Recursion.cs +++ b/src/tests/JIT/Directed/forceinlining/Recursion.cs @@ -4,10 +4,12 @@ using System; using System.Runtime.CompilerServices; using System.Diagnostics; +using Xunit; public class P { - public static int Main() + [Fact] + public static int TestEntryPoint() { bool pass = true; diff --git a/src/tests/JIT/Directed/forceinlining/Recursion.csproj b/src/tests/JIT/Directed/forceinlining/Recursion.csproj index 97ccf76701d670..15332f77c63db8 100644 --- a/src/tests/JIT/Directed/forceinlining/Recursion.csproj +++ b/src/tests/JIT/Directed/forceinlining/Recursion.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix.cs b/src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix.cs index 9f93cddb8233cc..d83fa3a57b7967 100644 --- a/src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix.cs +++ b/src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix.cs @@ -2,12 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; internal class Foo { } -internal class Test_gettypetypeofmatrix +public class Test_gettypetypeofmatrix { private static object s_null = null; private static object s_object = new object(); @@ -15,7 +16,8 @@ internal class Test_gettypetypeofmatrix private static Foo s_foo = new Foo(); private static Foo[] s_fooArray = new Foo[10]; - public static int Main() + [Fact] + public static int TestEntryPoint() { int returnCode = 100; try diff --git a/src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj b/src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix_gettypetypeof.csproj similarity index 85% rename from src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj rename to src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix_gettypetypeof.csproj index 5862596776a6eb..633e8fa521a059 100644 --- a/src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj +++ b/src/tests/JIT/Directed/gettypetypeof/gettypetypeofmatrix_gettypetypeof.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs b/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs index e59d59a2496215..f193693bf6475b 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs +++ b/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs @@ -7,6 +7,7 @@ using System; using System.Threading; using System.Runtime.CompilerServices; +using Xunit; public class IntrinsicTest { private static int s_counter = 3245; @@ -129,7 +130,8 @@ public static bool MainTest() return fail; } - private static int Main() + [Fact] + public static int TestEntryPoint() { if (MainTest()) { diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj b/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj index e19cb1ff671298..379c76b73b48fe 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.cs b/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.cs index f54ab969a47613..b14616e48b5ef1 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.cs +++ b/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.cs @@ -5,6 +5,7 @@ using System; using System.Threading; using System.Runtime.CompilerServices; +using Xunit; public class CMPXCHG { public static int g_static = -1; @@ -33,7 +34,8 @@ public static void Function(int bit, bool value) } } } - public static int Main() + [Fact] + public static int TestEntryPoint() { for (int i = 0; i < 10; ++i) { diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj b/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj index 9ed68b4784908d..d86867c6f231d6 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.cs b/src/tests/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.cs index 0e4086ef5e4323..0d21205c645478 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.cs +++ b/src/tests/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.cs @@ -5,7 +5,8 @@ using System; using System.Threading; using System.Runtime.CompilerServices; -internal class Foo +using Xunit; +public class Foo { private static int s_taskIdCounter; private int _taskId = 0; @@ -19,7 +20,8 @@ public int Function() } return _taskId; } - public static int Main() + [Fact] + public static int TestEntryPoint() { if (new Foo().Function() == 1) return 100; else return 101; } diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj b/src/tests/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj index 46fdef9107276a..d56091dbe67dbe 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/nullchecksuppress.cs b/src/tests/JIT/Directed/intrinsic/interlocked/nullchecksuppress.cs index 8dc1069b4b3a1e..03190785179607 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/nullchecksuppress.cs +++ b/src/tests/JIT/Directed/intrinsic/interlocked/nullchecksuppress.cs @@ -5,6 +5,7 @@ using System; using System.Threading; using System.Runtime.CompilerServices; +using Xunit; public class NCS { public int field; @@ -27,7 +28,8 @@ public static int CompareExchange(ref int value, int newData, int oldData) return Interlocked.CompareExchange(ref value, newData, oldData); } - public static int Main() + [Fact] + public static int TestEntryPoint() { NCS ncs = new NCS(); ncs.field = 99; diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj b/src/tests/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj index 77007aa9ad972e..c1e5f4e3219c96 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/regalloc1.cs b/src/tests/JIT/Directed/intrinsic/interlocked/regalloc1.cs index d6008e6fb820f2..b3565d94093ec0 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/regalloc1.cs +++ b/src/tests/JIT/Directed/intrinsic/interlocked/regalloc1.cs @@ -5,6 +5,7 @@ using System; using System.Threading; using System.Runtime.CompilerServices; +using Xunit; public class IntrinsicTest { private static int s_counter; @@ -60,7 +61,8 @@ public static bool MainTest() return fail; } - private static int Main() + [Fact] + public static int TestEntryPoint() { if (MainTest()) { diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/regalloc1.csproj b/src/tests/JIT/Directed/intrinsic/interlocked/regalloc1.csproj index c5cc7972c988c5..73bf4cfda6813b 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/regalloc1.csproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/regalloc1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/regalloc2.cs b/src/tests/JIT/Directed/intrinsic/interlocked/regalloc2.cs index 15c1705bcfff5b..a7a32d18802b2d 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/regalloc2.cs +++ b/src/tests/JIT/Directed/intrinsic/interlocked/regalloc2.cs @@ -5,6 +5,7 @@ using System; using System.Threading; using System.Runtime.CompilerServices; +using Xunit; public class IntrinsicTest { private static int s_counter; @@ -61,7 +62,8 @@ public static bool MainTest() return fail; } - private static int Main() + [Fact] + public static int TestEntryPoint() { if (MainTest()) { diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/regalloc2.csproj b/src/tests/JIT/Directed/intrinsic/interlocked/regalloc2.csproj index 66890038788407..842024358ba7e9 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/regalloc2.csproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/regalloc2.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il index 04d1b8eeffb60d..9990ef1cc7830b 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il +++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il @@ -14,7 +14,7 @@ .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) .ver 4:0:0:0 } -.assembly 'rva_rvaStatic1' +.assembly 'rva_rvastatic1_' { .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 @@ -12020,8 +12020,7 @@ IL_7b10: ret } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il index 249be975165c38..6260ec62ce6e24 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il +++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il @@ -14,7 +14,7 @@ .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) .ver 4:0:0:0 } -.assembly 'rva_rvaStatic2' +.assembly 'rva_rvastatic2_' { .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 @@ -12006,8 +12006,7 @@ IL_7b09: ret } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il index 4cec2514b139a0..df0afa4629f267 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il +++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il @@ -14,7 +14,7 @@ .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) .ver 4:0:0:0 } -.assembly 'rva_rvaStatic3' +.assembly 'rva_rvastatic3_' { .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 @@ -1096,8 +1096,7 @@ IL_0a34: ret } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il index 49b8a62952d12d..76e0ff89ef3427 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il +++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il @@ -14,7 +14,7 @@ .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) .ver 4:0:0:0 } -.assembly 'rva_rvaStatic4' +.assembly 'rva_rvastatic4_' { .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 @@ -1095,8 +1095,7 @@ IL_0a33: ret } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic1_.ilproj similarity index 92% rename from src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj rename to src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic1_.ilproj index 31ed7946e5ebf4..f91d13707fed77 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic1_.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic2_.ilproj similarity index 92% rename from src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj rename to src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic2_.ilproj index 875982dc52b4f6..d3124ae88387ac 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic2_.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic3_.ilproj similarity index 92% rename from src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj rename to src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic3_.ilproj index 06ed19be79459b..46b466b6d99601 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic3_.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic4_.ilproj similarity index 92% rename from src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj rename to src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic4_.ilproj index f8b67107c4d2aa..5678026ebd11e5 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj +++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvastatic4_.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow0.cs b/src/tests/JIT/Directed/intrinsic/pow/pow0.cs index 7b34cbe205d47a..b2192d8fe3044f 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow0.cs +++ b/src/tests/JIT/Directed/intrinsic/pow/pow0.cs @@ -5,10 +5,12 @@ //simple and recursive call using System; +using Xunit; -internal class pow0 +public class pow0 { - public static int Main() + [Fact] + public static int TestEntryPoint() { bool pass = true; double x, y, z; diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj index 85bbb1962fb7e5..4fa982621f6b41 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj index 7bc43be7cf218f..3623417092b730 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj index eddd5246ff1b19..58c5f46cd0ced4 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj index 3e7e261c1dd584..3749181496b3e3 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow1.cs b/src/tests/JIT/Directed/intrinsic/pow/pow1.cs index cfbfeac81b78bf..f13105be8d92ad 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow1.cs +++ b/src/tests/JIT/Directed/intrinsic/pow/pow1.cs @@ -6,10 +6,12 @@ using System; using System.Runtime.InteropServices; +using Xunit; -internal class pow1 +public class pow1 { - public static int Main() + [Fact] + public static int TestEntryPoint() { double x, y, z; bool pass = true; diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow1.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow1.csproj index 2c35a02b2b1791..6b41fcec89f079 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow1.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow2.cs b/src/tests/JIT/Directed/intrinsic/pow/pow2.cs index feab0d7256c6f8..fc8e9cc75aaaf3 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow2.cs +++ b/src/tests/JIT/Directed/intrinsic/pow/pow2.cs @@ -5,6 +5,7 @@ //testing plain double, array member, struct member or class member using System; +using Xunit; internal struct vt { @@ -19,58 +20,59 @@ public cl() x = new double[6, 5, 4]; } } -internal class pow2 +public class pow2 { - public static double CalculateSinh(double x) + private static double CalculateSinh(double x) { double a = Math.Pow(Math.E, x); double b = Math.Pow(Math.E, -x); return (a - b) / 2; } - public static double CalculateSinh(double[] x) + private static double CalculateSinh(double[] x) { double a = Math.Pow(Math.E, x[1]); double b = Math.Pow(Math.E, -x[1]); return (a - b) / 2; } - public static double CalculateSinh(double[,] x) + private static double CalculateSinh(double[,] x) { double a = Math.Pow(Math.E, x[1, 1]); double b = Math.Pow(Math.E, -x[1, 1]); return (a - b) / 2; } - public static double CalculateSinh(double[,,] x) + private static double CalculateSinh(double[,,] x) { double a = Math.Pow(Math.E, x[2, 1, 1]); double b = Math.Pow(Math.E, -x[2, 1, 1]); return (a - b) / 2; } - public static double CalculateSinh(double[][,] x) + private static double CalculateSinh(double[][,] x) { double a = Math.Pow(Math.E, x[2][1, 1]); double b = Math.Pow(Math.E, -x[2][1, 1]); return (a - b) / 2; } - public static double CalculateSinh(vt vt1) + private static double CalculateSinh(vt vt1) { double a = Math.Pow(Math.E, vt1.x[1, 1]); double b = Math.Pow(Math.E, -vt1.x[1, 1]); return (a - b) / 2; } - public static double CalculateSinh(cl cl1) + private static double CalculateSinh(cl cl1) { double a = Math.Pow(Math.E, cl1.x[5, 1, 3]); double b = Math.Pow(Math.E, -cl1.x[5, 1, 3]); return (a - b) / 2; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool pass = true; diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj index 4bb6bcc55efa3a..f147b929220dd9 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj index eed91bb0f0d619..be728b3d302dd4 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj index 540e15147fc492..9171ae6c56a9ff 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj index f56912064d1500..a2699d753a005c 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow3.cs b/src/tests/JIT/Directed/intrinsic/pow/pow3.cs index e319c9d57c2242..a0b12817311dc3 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow3.cs +++ b/src/tests/JIT/Directed/intrinsic/pow/pow3.cs @@ -5,10 +5,12 @@ //different data types, Int16, Int32, Int64, etc using System; +using Xunit; -internal class pow3 +public class pow3 { - public static int Main() + [Fact] + public static int TestEntryPoint() { bool pass = true; diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj index 88ba5dcfc732ca..8a01bddde3f37e 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj index 46df4073e171fc..c5e650360f6fef 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj index e52618156094f9..f740a283b3b4a4 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj b/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj index f6060a795ef7fb..48caeab7362e85 100644 --- a/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj +++ b/src/tests/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/catch1_d.ilproj b/src/tests/JIT/Directed/leave/catch1_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/catch1_d.ilproj rename to src/tests/JIT/Directed/leave/catch1_il_d.ilproj index 53afac4ba4c5ef..88b87e60e6e6b9 100644 --- a/src/tests/JIT/Directed/leave/catch1_d.ilproj +++ b/src/tests/JIT/Directed/leave/catch1_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/catch1_r.ilproj b/src/tests/JIT/Directed/leave/catch1_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/catch1_r.ilproj rename to src/tests/JIT/Directed/leave/catch1_il_r.ilproj index 93e55a9d540d64..4e7c9523cd61e4 100644 --- a/src/tests/JIT/Directed/leave/catch1_r.ilproj +++ b/src/tests/JIT/Directed/leave/catch1_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/catch2_d.ilproj b/src/tests/JIT/Directed/leave/catch2_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/catch2_d.ilproj rename to src/tests/JIT/Directed/leave/catch2_il_d.ilproj index ab055d704b62c6..372707cfcad071 100644 --- a/src/tests/JIT/Directed/leave/catch2_d.ilproj +++ b/src/tests/JIT/Directed/leave/catch2_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/catch2_r.ilproj b/src/tests/JIT/Directed/leave/catch2_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/catch2_r.ilproj rename to src/tests/JIT/Directed/leave/catch2_il_r.ilproj index 798860e646ef78..b8079243adf8c6 100644 --- a/src/tests/JIT/Directed/leave/catch2_r.ilproj +++ b/src/tests/JIT/Directed/leave/catch2_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/catch3_d.ilproj b/src/tests/JIT/Directed/leave/catch3_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/catch3_d.ilproj rename to src/tests/JIT/Directed/leave/catch3_il_d.ilproj index 2783bf40ee8230..398f0d62273ec8 100644 --- a/src/tests/JIT/Directed/leave/catch3_d.ilproj +++ b/src/tests/JIT/Directed/leave/catch3_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/catch3_r.ilproj b/src/tests/JIT/Directed/leave/catch3_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/catch3_r.ilproj rename to src/tests/JIT/Directed/leave/catch3_il_r.ilproj index b62285bd16ad9b..db8568cc100a5c 100644 --- a/src/tests/JIT/Directed/leave/catch3_r.ilproj +++ b/src/tests/JIT/Directed/leave/catch3_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/filter1_d.ilproj b/src/tests/JIT/Directed/leave/filter1_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/filter1_d.ilproj rename to src/tests/JIT/Directed/leave/filter1_il_d.ilproj index 278fbe4281b965..f2f27874cf762d 100644 --- a/src/tests/JIT/Directed/leave/filter1_d.ilproj +++ b/src/tests/JIT/Directed/leave/filter1_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/filter1_r.ilproj b/src/tests/JIT/Directed/leave/filter1_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/filter1_r.ilproj rename to src/tests/JIT/Directed/leave/filter1_il_r.ilproj index c5a87ea4de8654..54c25e37ed36fc 100644 --- a/src/tests/JIT/Directed/leave/filter1_r.ilproj +++ b/src/tests/JIT/Directed/leave/filter1_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/filter2_d.ilproj b/src/tests/JIT/Directed/leave/filter2_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/filter2_d.ilproj rename to src/tests/JIT/Directed/leave/filter2_il_d.ilproj index 392f076f8b4d61..1e193a27078e69 100644 --- a/src/tests/JIT/Directed/leave/filter2_d.ilproj +++ b/src/tests/JIT/Directed/leave/filter2_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/filter2_r.ilproj b/src/tests/JIT/Directed/leave/filter2_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/filter2_r.ilproj rename to src/tests/JIT/Directed/leave/filter2_il_r.ilproj index e15d564c3e3260..7926f1228be422 100644 --- a/src/tests/JIT/Directed/leave/filter2_r.ilproj +++ b/src/tests/JIT/Directed/leave/filter2_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/filter3_d.ilproj b/src/tests/JIT/Directed/leave/filter3_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/filter3_d.ilproj rename to src/tests/JIT/Directed/leave/filter3_il_d.ilproj index c110f15ce7c807..82b3295827c3d0 100644 --- a/src/tests/JIT/Directed/leave/filter3_d.ilproj +++ b/src/tests/JIT/Directed/leave/filter3_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/filter3_r.ilproj b/src/tests/JIT/Directed/leave/filter3_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/filter3_r.ilproj rename to src/tests/JIT/Directed/leave/filter3_il_r.ilproj index a2700d28a47b58..c9c5cd5253609e 100644 --- a/src/tests/JIT/Directed/leave/filter3_r.ilproj +++ b/src/tests/JIT/Directed/leave/filter3_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/try1_d.ilproj b/src/tests/JIT/Directed/leave/try1_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/try1_d.ilproj rename to src/tests/JIT/Directed/leave/try1_il_d.ilproj index 813eb49f488afe..3b6350e9b18824 100644 --- a/src/tests/JIT/Directed/leave/try1_d.ilproj +++ b/src/tests/JIT/Directed/leave/try1_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/try1_r.ilproj b/src/tests/JIT/Directed/leave/try1_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/try1_r.ilproj rename to src/tests/JIT/Directed/leave/try1_il_r.ilproj index bdd54eecdee02f..30fb504ffdc2b7 100644 --- a/src/tests/JIT/Directed/leave/try1_r.ilproj +++ b/src/tests/JIT/Directed/leave/try1_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/try2_d.ilproj b/src/tests/JIT/Directed/leave/try2_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/try2_d.ilproj rename to src/tests/JIT/Directed/leave/try2_il_d.ilproj index 6f9090c13075c4..275176991c3f2a 100644 --- a/src/tests/JIT/Directed/leave/try2_d.ilproj +++ b/src/tests/JIT/Directed/leave/try2_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/try2_r.ilproj b/src/tests/JIT/Directed/leave/try2_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/try2_r.ilproj rename to src/tests/JIT/Directed/leave/try2_il_r.ilproj index fe7abc31d1b8da..476aa50c5594d0 100644 --- a/src/tests/JIT/Directed/leave/try2_r.ilproj +++ b/src/tests/JIT/Directed/leave/try2_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/try3_d.ilproj b/src/tests/JIT/Directed/leave/try3_il_d.ilproj similarity index 88% rename from src/tests/JIT/Directed/leave/try3_d.ilproj rename to src/tests/JIT/Directed/leave/try3_il_d.ilproj index ad36334c67cbbe..ce9d30b766a304 100644 --- a/src/tests/JIT/Directed/leave/try3_d.ilproj +++ b/src/tests/JIT/Directed/leave/try3_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/leave/try3_r.ilproj b/src/tests/JIT/Directed/leave/try3_il_r.ilproj similarity index 89% rename from src/tests/JIT/Directed/leave/try3_r.ilproj rename to src/tests/JIT/Directed/leave/try3_il_r.ilproj index 583bd08643927d..08eafdeb26be41 100644 --- a/src/tests/JIT/Directed/leave/try3_r.ilproj +++ b/src/tests/JIT/Directed/leave/try3_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/lifetime/ObjBlkMemLiveness.cs b/src/tests/JIT/Directed/lifetime/ObjBlkMemLiveness.cs index d9ea48efcc8953..ced72c99223bbe 100644 --- a/src/tests/JIT/Directed/lifetime/ObjBlkMemLiveness.cs +++ b/src/tests/JIT/Directed/lifetime/ObjBlkMemLiveness.cs @@ -7,10 +7,12 @@ using System; using System.Runtime.Intrinsics; using System.Runtime.CompilerServices; +using Xunit; -unsafe class ObjBlkLiveness +public unsafe class ObjBlkLiveness { - public static int Main() + [Fact] + public static int TestEntryPoint() { var a = Vector128.Zero; return Problem(&a, 1) ? 100 : 101; diff --git a/src/tests/JIT/Directed/lifetime/ObjBlkMemLiveness.csproj b/src/tests/JIT/Directed/lifetime/ObjBlkMemLiveness.csproj index d750325512fd94..507dc5ab682e82 100644 --- a/src/tests/JIT/Directed/lifetime/ObjBlkMemLiveness.csproj +++ b/src/tests/JIT/Directed/lifetime/ObjBlkMemLiveness.csproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/lifetime/PartialDefLiveness.cs b/src/tests/JIT/Directed/lifetime/PartialDefLiveness.cs index 474f2cb528e9c1..54117bad2dbde1 100644 --- a/src/tests/JIT/Directed/lifetime/PartialDefLiveness.cs +++ b/src/tests/JIT/Directed/lifetime/PartialDefLiveness.cs @@ -8,10 +8,12 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Xunit; -class PartialDefLiveness +public class PartialDefLiveness { - public static int Main() + [Fact] + public static int TestEntryPoint() { // Just making sure we'll not hit any asserts in SSA. Problem(); diff --git a/src/tests/JIT/Directed/lifetime/PartialDefLiveness.csproj b/src/tests/JIT/Directed/lifetime/PartialDefLiveness.csproj index d750325512fd94..507dc5ab682e82 100644 --- a/src/tests/JIT/Directed/lifetime/PartialDefLiveness.csproj +++ b/src/tests/JIT/Directed/lifetime/PartialDefLiveness.csproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/lifetime/lifetime1.cs b/src/tests/JIT/Directed/lifetime/lifetime1.cs index 70819888a25874..18e8fb20f3fd46 100644 --- a/src/tests/JIT/Directed/lifetime/lifetime1.cs +++ b/src/tests/JIT/Directed/lifetime/lifetime1.cs @@ -5,8 +5,9 @@ // testing the JIT handling and GC reporting of "liveness" of GC variable using System; +using Xunit; -internal class Test_lifetime1 +public class Test_lifetime1 { private class A { @@ -102,7 +103,8 @@ public static int f3() } - private static int Main() + [Fact] + public static int TestEntryPoint() { if (f1() != 100) return -1; CleanGC(); diff --git a/src/tests/JIT/Directed/lifetime/lifetime1.csproj b/src/tests/JIT/Directed/lifetime/lifetime1.csproj index e8824612281a9a..4c87787611dad0 100644 --- a/src/tests/JIT/Directed/lifetime/lifetime1.csproj +++ b/src/tests/JIT/Directed/lifetime/lifetime1.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/lifetime/lifetime2.cs b/src/tests/JIT/Directed/lifetime/lifetime2.cs index 7ab5b491cc3e0c..1567dbd3210ddb 100644 --- a/src/tests/JIT/Directed/lifetime/lifetime2.cs +++ b/src/tests/JIT/Directed/lifetime/lifetime2.cs @@ -6,8 +6,9 @@ using System; using System.Collections.Generic; +using Xunit; -internal class Test_lifetime2 +public class Test_lifetime2 { public static int aExists; public static int bExists; @@ -180,7 +181,8 @@ private static int f5() return 100; } - private static int Main() + [Fact] + public static int TestEntryPoint() { if (f1() != 100) return -1; diff --git a/src/tests/JIT/Directed/lifetime/lifetime2.csproj b/src/tests/JIT/Directed/lifetime/lifetime2.csproj index c5776b8cab5645..32332ad8fb23ee 100644 --- a/src/tests/JIT/Directed/lifetime/lifetime2.csproj +++ b/src/tests/JIT/Directed/lifetime/lifetime2.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 diff --git a/src/tests/JIT/Directed/localloc/localloc3.cs b/src/tests/JIT/Directed/localloc/localloc3.cs index b20cddd71d8269..67c112a8936f40 100644 --- a/src/tests/JIT/Directed/localloc/localloc3.cs +++ b/src/tests/JIT/Directed/localloc/localloc3.cs @@ -3,8 +3,9 @@ // using System; +using Xunit; -internal unsafe class test1 +public unsafe class test1 { static public int f(int i) { @@ -26,7 +27,8 @@ static public void f1() char* p = stackalloc char[1000000]; } - unsafe public static int Main() + [Fact] + unsafe public static int TestEntryPoint() { bool pass = true; diff --git a/src/tests/JIT/Directed/localloc/localloc3_cs_d.csproj b/src/tests/JIT/Directed/localloc/localloc3_cs_d.csproj index 5aba2f0f5244ad..f9b0d177f9fd21 100644 --- a/src/tests/JIT/Directed/localloc/localloc3_cs_d.csproj +++ b/src/tests/JIT/Directed/localloc/localloc3_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/localloc/localloc3_cs_do.csproj b/src/tests/JIT/Directed/localloc/localloc3_cs_do.csproj index 11b36013978671..f7fb087ad4337d 100644 --- a/src/tests/JIT/Directed/localloc/localloc3_cs_do.csproj +++ b/src/tests/JIT/Directed/localloc/localloc3_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/localloc/localloc3_cs_r.csproj b/src/tests/JIT/Directed/localloc/localloc3_cs_r.csproj index d601e0968ba812..305b9d725081ca 100644 --- a/src/tests/JIT/Directed/localloc/localloc3_cs_r.csproj +++ b/src/tests/JIT/Directed/localloc/localloc3_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/localloc/localloc3_cs_ro.csproj b/src/tests/JIT/Directed/localloc/localloc3_cs_ro.csproj index 3f74ca0c0755d2..c185ef8be96159 100644 --- a/src/tests/JIT/Directed/localloc/localloc3_cs_ro.csproj +++ b/src/tests/JIT/Directed/localloc/localloc3_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/newarr/newarr.cs b/src/tests/JIT/Directed/newarr/newarr.cs index e7ec5d314d0bce..18e16a8fe15f66 100644 --- a/src/tests/JIT/Directed/newarr/newarr.cs +++ b/src/tests/JIT/Directed/newarr/newarr.cs @@ -3,10 +3,12 @@ // using System; +using Xunit; -internal class AA +public class AA { - private static int Main() + [Fact] + public static int TestEntryPoint() { uint SMALL1 = 0x00000100; uint SMALL2 = 0x7fffffff; diff --git a/src/tests/JIT/Directed/newarr/newarr.csproj b/src/tests/JIT/Directed/newarr/newarr.csproj index 9dc98caff81a80..17ce8036e6a829 100644 --- a/src/tests/JIT/Directed/newarr/newarr.csproj +++ b/src/tests/JIT/Directed/newarr/newarr.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype.cs b/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype.cs index 49d019f8738842..8d7d0ccb64ef94 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype.cs +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype.cs @@ -4,6 +4,7 @@ using System.Runtime.InteropServices; using System; +using Xunit; internal class NullableTest1 @@ -4693,9 +4694,10 @@ public static void Run() } -internal class Test_boxunboxvaluetype +public class Test_boxunboxvaluetype { - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj b/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj index cc9ce5e4fb95bb..98155b9a10fa0f 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj b/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj index adc0b4fa999572..7a0c22fe4800c0 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj b/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj index f636c4638f65a4..c4053066f29acb 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison.cs b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison.cs index ef07c0c3f53cc6..ad151765bf7b98 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison.cs +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System; +using Xunit; internal class NullableTest1 @@ -1553,9 +1554,10 @@ public static void Run() -internal class Test_nullcomparaison +public class Test_nullcomparaison { - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj index 1cb22113619e81..ee08f5344a6893 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj index c16611302bdab9..8ad4a64fbfcb26 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj index 3d5b6d780781f1..9f303bc0be4f41 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj index 650e74b623c4d6..ddb068abf09c34 100644 --- a/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxenum.cs b/src/tests/JIT/Directed/nullabletypes/boxunboxenum.cs index 5fc305d39cc218..d601fb80bbacc6 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxenum.cs +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxenum.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System; +using Xunit; internal class NullableTest1 @@ -134,9 +135,10 @@ public static void Run() -internal class Test_boxunboxenum +public class Test_boxunboxenum { - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxenum_d.csproj b/src/tests/JIT/Directed/nullabletypes/boxunboxenum_d.csproj index 0893bd69001fdd..b3ef25cb52f11e 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxenum_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxenum_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxenum_do.csproj b/src/tests/JIT/Directed/nullabletypes/boxunboxenum_do.csproj index cea5ba3066564d..571511f291b28a 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxenum_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxenum_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxenum_r.csproj b/src/tests/JIT/Directed/nullabletypes/boxunboxenum_r.csproj index 19eaeafc124517..314859cb3b8968 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxenum_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxenum_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj b/src/tests/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj index fb39bc9811a3d3..3842d9738466f6 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface.cs b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface.cs index 99af47b148b991..d1c5d38e51bad1 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface.cs +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System; +using Xunit; internal class NullableTest1 @@ -797,9 +798,10 @@ public static void Run() -internal class Test_boxunboxinterface +public class Test_boxunboxinterface { - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj index 9199cd42de7144..f7c45059200e34 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj index 620902767a78e2..878e16a8d86476 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj index 34071eeafcb007..277fe772e95047 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj index c8f5a9c2759872..b54b09de265303 100644 --- a/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/nullabletypes/castclassenum.cs b/src/tests/JIT/Directed/nullabletypes/castclassenum.cs index fecef584b6adcb..c7b7ad1ffd16aa 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassenum.cs +++ b/src/tests/JIT/Directed/nullabletypes/castclassenum.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System; +using Xunit; internal class NullableTest1 @@ -134,9 +135,10 @@ public static void Run() -internal class Test_castclassenum +public class Test_castclassenum { - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/castclassenum_d.csproj b/src/tests/JIT/Directed/nullabletypes/castclassenum_d.csproj index 3c90a6bdfda052..a5b80d4c932fdd 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassenum_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassenum_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/nullabletypes/castclassenum_do.csproj b/src/tests/JIT/Directed/nullabletypes/castclassenum_do.csproj index 6fc3fc1444ec58..3382de72cfff72 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassenum_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassenum_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/nullabletypes/castclassenum_r.csproj b/src/tests/JIT/Directed/nullabletypes/castclassenum_r.csproj index e956bd90067415..1016777aa5f473 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassenum_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassenum_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/nullabletypes/castclassenum_ro.csproj b/src/tests/JIT/Directed/nullabletypes/castclassenum_ro.csproj index 15cedfb58b1d9d..2e58ee02274be0 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassenum_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassenum_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/nullabletypes/castclassinterface.cs b/src/tests/JIT/Directed/nullabletypes/castclassinterface.cs index 2e96673863a306..9d9f9e7ff2bf27 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassinterface.cs +++ b/src/tests/JIT/Directed/nullabletypes/castclassinterface.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System; +using Xunit; internal class NullableTest1 @@ -779,9 +780,10 @@ public static void Run() -internal class Test_castclassinterface +public class Test_castclassinterface { - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/castclassinterface_d.csproj b/src/tests/JIT/Directed/nullabletypes/castclassinterface_d.csproj index 4666277640ee6e..565a3226284e63 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassinterface_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassinterface_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/nullabletypes/castclassinterface_do.csproj b/src/tests/JIT/Directed/nullabletypes/castclassinterface_do.csproj index e55cfc8413dc14..7547fae7c4737f 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassinterface_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassinterface_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/nullabletypes/castclassinterface_r.csproj b/src/tests/JIT/Directed/nullabletypes/castclassinterface_r.csproj index 6c8523eba5eb8a..c49444c76a8c42 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassinterface_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassinterface_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/nullabletypes/castclassinterface_ro.csproj b/src/tests/JIT/Directed/nullabletypes/castclassinterface_ro.csproj index 01f2113e8bafc9..b255b48a75ce6a 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassinterface_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassinterface_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype.cs b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype.cs index 8f0ff92210cf75..1d7bbed45bdd2e 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype.cs +++ b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System; +using Xunit; internal class NullableTest1 @@ -4692,9 +4693,10 @@ public static void Run() } -internal class Test_castclassvaluetype +public class Test_castclassvaluetype { - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj index 0f9638aff55053..5296b80fb3b1d5 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj index 9b9ab5d893e3b2..71726ef42ffe8a 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj index 0a5e94b00fa54a..7ce37e40720b5b 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj index a2ed05406ccdf7..56ea4e183a7902 100644 --- a/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Directed/nullabletypes/constructor_d.csproj b/src/tests/JIT/Directed/nullabletypes/constructor_d.csproj index 3ce7e88f88ad50..6ab4de272c8385 100644 --- a/src/tests/JIT/Directed/nullabletypes/constructor_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/constructor_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/constructor_do.csproj b/src/tests/JIT/Directed/nullabletypes/constructor_do.csproj index f60c9a66648749..f526947f878cac 100644 --- a/src/tests/JIT/Directed/nullabletypes/constructor_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/constructor_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/constructor_r.csproj b/src/tests/JIT/Directed/nullabletypes/constructor_r.csproj index cdfeb2ac942d6d..90bcc3f8610f99 100644 --- a/src/tests/JIT/Directed/nullabletypes/constructor_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/constructor_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/constructor_ro.csproj b/src/tests/JIT/Directed/nullabletypes/constructor_ro.csproj index 007389c2667b9c..40a3da121f91fe 100644 --- a/src/tests/JIT/Directed/nullabletypes/constructor_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/constructor_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/gettype.cs b/src/tests/JIT/Directed/nullabletypes/gettype.cs index 15bbef729d26f9..da1aa176556444 100644 --- a/src/tests/JIT/Directed/nullabletypes/gettype.cs +++ b/src/tests/JIT/Directed/nullabletypes/gettype.cs @@ -4,6 +4,7 @@ using System; using System.Linq; using System.Collections.Generic; +using Xunit; class C { @@ -19,7 +20,8 @@ public bool Check() public class P { - public static int Main() + [Fact] + public static int TestEntryPoint() { C c = new(); diff --git a/src/tests/JIT/Directed/nullabletypes/gettype_d.csproj b/src/tests/JIT/Directed/nullabletypes/gettype_d.csproj index 749b1f23c89758..ede27961c4fc8d 100644 --- a/src/tests/JIT/Directed/nullabletypes/gettype_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/gettype_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/gettype_do.csproj b/src/tests/JIT/Directed/nullabletypes/gettype_do.csproj index 34744812c89277..b66da132ee77e4 100644 --- a/src/tests/JIT/Directed/nullabletypes/gettype_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/gettype_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/gettype_r.csproj b/src/tests/JIT/Directed/nullabletypes/gettype_r.csproj index fea75d031b0ed3..e8f79d53834717 100644 --- a/src/tests/JIT/Directed/nullabletypes/gettype_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/gettype_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/gettype_ro.csproj b/src/tests/JIT/Directed/nullabletypes/gettype_ro.csproj index f51b4298ce4d6e..c643baf63ce38e 100644 --- a/src/tests/JIT/Directed/nullabletypes/gettype_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/gettype_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/hashcode_d.csproj b/src/tests/JIT/Directed/nullabletypes/hashcode_d.csproj index 5d79828e64efb6..bcdf5eb1b4e9a7 100644 --- a/src/tests/JIT/Directed/nullabletypes/hashcode_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/hashcode_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/nullabletypes/hashcode_do.csproj b/src/tests/JIT/Directed/nullabletypes/hashcode_do.csproj index f0165e735a52ad..d87c6ceb3cf7a3 100644 --- a/src/tests/JIT/Directed/nullabletypes/hashcode_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/hashcode_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/nullabletypes/hashcode_r.csproj b/src/tests/JIT/Directed/nullabletypes/hashcode_r.csproj index ca7652cede4bb1..f623daf60f957e 100644 --- a/src/tests/JIT/Directed/nullabletypes/hashcode_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/hashcode_r.csproj @@ -1,7 +1,4 @@ - - Exe - None diff --git a/src/tests/JIT/Directed/nullabletypes/hashcode_ro.csproj b/src/tests/JIT/Directed/nullabletypes/hashcode_ro.csproj index dd66daa4edc210..adbad9caec276b 100644 --- a/src/tests/JIT/Directed/nullabletypes/hashcode_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/hashcode_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None diff --git a/src/tests/JIT/Directed/nullabletypes/hasvalue_d.csproj b/src/tests/JIT/Directed/nullabletypes/hasvalue_d.csproj index 8629cdf281d15b..e3718689827438 100644 --- a/src/tests/JIT/Directed/nullabletypes/hasvalue_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/hasvalue_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/hasvalue_do.csproj b/src/tests/JIT/Directed/nullabletypes/hasvalue_do.csproj index 1fd3644afee360..17c7038594a588 100644 --- a/src/tests/JIT/Directed/nullabletypes/hasvalue_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/hasvalue_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/hasvalue_r.csproj b/src/tests/JIT/Directed/nullabletypes/hasvalue_r.csproj index acc1d7fa3d206e..2dccb1127ba574 100644 --- a/src/tests/JIT/Directed/nullabletypes/hasvalue_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/hasvalue_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/hasvalue_ro.csproj b/src/tests/JIT/Directed/nullabletypes/hasvalue_ro.csproj index 40791239d2da9f..48fab0d5e616c9 100644 --- a/src/tests/JIT/Directed/nullabletypes/hasvalue_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/hasvalue_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/invocation_d.csproj b/src/tests/JIT/Directed/nullabletypes/invocation_d.csproj index 86af0c0a15bda1..923c18fdf78624 100644 --- a/src/tests/JIT/Directed/nullabletypes/invocation_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/invocation_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/invocation_do.csproj b/src/tests/JIT/Directed/nullabletypes/invocation_do.csproj index 2bb0036ef9d48c..338f3875c4a611 100644 --- a/src/tests/JIT/Directed/nullabletypes/invocation_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/invocation_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/invocation_r.csproj b/src/tests/JIT/Directed/nullabletypes/invocation_r.csproj index b0cfe5f63d452e..f1fbcbad5f0411 100644 --- a/src/tests/JIT/Directed/nullabletypes/invocation_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/invocation_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/invocation_ro.csproj b/src/tests/JIT/Directed/nullabletypes/invocation_ro.csproj index 9ab3e5b65463d0..9bf7f5615f041f 100644 --- a/src/tests/JIT/Directed/nullabletypes/invocation_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/invocation_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/invokecommon.cs b/src/tests/JIT/Directed/nullabletypes/invokecommon.cs index c7abb292cb6a72..08f232412c32a2 100644 --- a/src/tests/JIT/Directed/nullabletypes/invokecommon.cs +++ b/src/tests/JIT/Directed/nullabletypes/invokecommon.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; public sealed class TestException : Exception { @@ -47,7 +48,8 @@ public static void Eval(object obj1, object obj2) throw new TestException(counter, "Failure while Comparing {1} to {2}", obj1, obj2); } - public static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/isinst.cs b/src/tests/JIT/Directed/nullabletypes/isinst.cs index ebe3a84ef2beb3..716bbecf05b2d0 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst.cs +++ b/src/tests/JIT/Directed/nullabletypes/isinst.cs @@ -7,8 +7,9 @@ using System; using System.Runtime.InteropServices; +using Xunit; -internal class Program +public class Program { private static void Eval(int testCase, bool b1, bool b2) { @@ -15344,7 +15345,8 @@ private static void TestCase0018() } } // end of test case 0018 - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/isinst2.cs b/src/tests/JIT/Directed/nullabletypes/isinst2.cs index 63c1bfa7fae649..a465cb8574c96e 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst2.cs +++ b/src/tests/JIT/Directed/nullabletypes/isinst2.cs @@ -7,8 +7,9 @@ using System; using System.Runtime.InteropServices; +using Xunit; -internal class Program +public class Program { private static void Eval(int testCase, bool b1, bool b2) { @@ -17260,7 +17261,8 @@ private static void TestCase0036() } } // end of test case 0036 - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/isinst2_d.csproj b/src/tests/JIT/Directed/nullabletypes/isinst2_d.csproj index b6855dd3bc77f8..a8df8e8067591d 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst2_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinst2_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinst2_do.csproj b/src/tests/JIT/Directed/nullabletypes/isinst2_do.csproj index 53b344d60147e4..38900ed83be37e 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst2_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinst2_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinst2_r.csproj b/src/tests/JIT/Directed/nullabletypes/isinst2_r.csproj index 66a8cd648d4576..a74f1736760aa8 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst2_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinst2_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinst2_ro.csproj b/src/tests/JIT/Directed/nullabletypes/isinst2_ro.csproj index 6122be47ffc7fb..349a25d6b6b1bc 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst2_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinst2_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinst_d.csproj b/src/tests/JIT/Directed/nullabletypes/isinst_d.csproj index 194db96e3dabb1..1a3b70967d32d1 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinst_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinst_do.csproj b/src/tests/JIT/Directed/nullabletypes/isinst_do.csproj index 1c06ccfef381a4..cb0924a7a55805 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinst_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/nullabletypes/isinst_r.csproj b/src/tests/JIT/Directed/nullabletypes/isinst_r.csproj index a20ee3390f34a2..5b27243f851f5f 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinst_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinst_ro.csproj b/src/tests/JIT/Directed/nullabletypes/isinst_ro.csproj index 4f7ce1953bc165..f6f4b5a9ef2daa 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinst_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinst_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstboxed.cs b/src/tests/JIT/Directed/nullabletypes/isinstboxed.cs index 19560a0828cd37..ec2f399aab0e97 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstboxed.cs +++ b/src/tests/JIT/Directed/nullabletypes/isinstboxed.cs @@ -6,8 +6,9 @@ using System; using System.Runtime.InteropServices; +using Xunit; -internal class Program +public class Program { private static void Eval(int testCase, bool b1, bool b2) { @@ -14461,7 +14462,8 @@ private static void TestCase0017() } // end of test case 0017 - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/isinstboxed_d.csproj b/src/tests/JIT/Directed/nullabletypes/isinstboxed_d.csproj index 33569204c32041..e5ab77bf5c5628 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstboxed_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstboxed_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstboxed_do.csproj b/src/tests/JIT/Directed/nullabletypes/isinstboxed_do.csproj index ee8de2504abbad..09f7da8ffec510 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstboxed_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstboxed_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstboxed_r.csproj b/src/tests/JIT/Directed/nullabletypes/isinstboxed_r.csproj index ec00e3fcb3af76..1ad2a08a758dc7 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstboxed_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstboxed_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstboxed_ro.csproj b/src/tests/JIT/Directed/nullabletypes/isinstboxed_ro.csproj index e376f237cf3a5b..27f977493fd21d 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstboxed_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstboxed_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstenum.cs b/src/tests/JIT/Directed/nullabletypes/isinstenum.cs index cefc6eea065c1e..5b2af929e42594 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstenum.cs +++ b/src/tests/JIT/Directed/nullabletypes/isinstenum.cs @@ -6,8 +6,9 @@ using System; using System.Runtime.InteropServices; +using Xunit; -internal class Program +public class Program { private static void Eval(int testCase, bool b1, bool b2) { @@ -636,7 +637,8 @@ private static void TestCase0003() } } // end of test case 0003 - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/isinstenum_d.csproj b/src/tests/JIT/Directed/nullabletypes/isinstenum_d.csproj index 44f2b3962d10e2..1b3316e7e224b2 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstenum_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstenum_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstenum_do.csproj b/src/tests/JIT/Directed/nullabletypes/isinstenum_do.csproj index ee901a2826ad3f..0e0edd83f2bec1 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstenum_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstenum_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstenum_r.csproj b/src/tests/JIT/Directed/nullabletypes/isinstenum_r.csproj index 9b6965c0361906..41cade5db8b4a7 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstenum_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstenum_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstenum_ro.csproj b/src/tests/JIT/Directed/nullabletypes/isinstenum_ro.csproj index fb659268bbce1d..567a95ce1651b9 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstenum_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstenum_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstgenerics.cs b/src/tests/JIT/Directed/nullabletypes/isinstgenerics.cs index f3fc7cc4a4aed3..3f89ea497d33fc 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstgenerics.cs +++ b/src/tests/JIT/Directed/nullabletypes/isinstgenerics.cs @@ -7,8 +7,9 @@ using System; using System.Runtime.InteropServices; +using Xunit; -internal class Program +public class Program { private static void Eval(int testCase, bool b1, bool b2) { @@ -16303,7 +16304,8 @@ private static void TestCase0017() where T : struct } // end of test case 0017 - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/isinstgenerics_d.csproj b/src/tests/JIT/Directed/nullabletypes/isinstgenerics_d.csproj index c769c50222743c..89cbb0f2987014 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstgenerics_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstgenerics_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstgenerics_do.csproj b/src/tests/JIT/Directed/nullabletypes/isinstgenerics_do.csproj index da4e8a3ce63361..540aa556ce217f 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstgenerics_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstgenerics_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstgenerics_r.csproj b/src/tests/JIT/Directed/nullabletypes/isinstgenerics_r.csproj index 67f0f70a7bf90a..df6fb5e1a7b7db 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstgenerics_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstgenerics_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj b/src/tests/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj index 4368e08e1d04bd..e59519cd28d4f2 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstinterface.cs b/src/tests/JIT/Directed/nullabletypes/isinstinterface.cs index 4bbd8df0879d2d..d58fd0698f915b 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstinterface.cs +++ b/src/tests/JIT/Directed/nullabletypes/isinstinterface.cs @@ -6,8 +6,9 @@ using System; using System.Runtime.InteropServices; +using Xunit; -internal class Program +public class Program { private static void Eval(int testCase, bool b1, bool b2) { @@ -6981,7 +6982,8 @@ private static void TestCase0018() } } // end of test case 0018 - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/isinstinterface_d.csproj b/src/tests/JIT/Directed/nullabletypes/isinstinterface_d.csproj index 56b97d77fc056e..fe5eeb0fa52002 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstinterface_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstinterface_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstinterface_do.csproj b/src/tests/JIT/Directed/nullabletypes/isinstinterface_do.csproj index 6427e23082cda5..8536cc4e57ea63 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstinterface_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstinterface_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstinterface_r.csproj b/src/tests/JIT/Directed/nullabletypes/isinstinterface_r.csproj index 7ca04382ff497e..b55a59dd87be9b 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstinterface_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstinterface_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstinterface_ro.csproj b/src/tests/JIT/Directed/nullabletypes/isinstinterface_ro.csproj index 78b2a8a880c3c9..a09e739cbaf97b 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstinterface_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstinterface_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype.cs b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype.cs index ece9f62cc481d8..4c1b9407eb972a 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype.cs +++ b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype.cs @@ -6,8 +6,9 @@ using System; using System.Runtime.InteropServices; +using Xunit; -internal class Program +public class Program { private static void Eval(int testCase, bool b1, bool b2) { @@ -19701,7 +19702,8 @@ private static void TestCase0036() } } // end of test case 0036 - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj index 6669a84c087856..4ea2a4a4f42f1e 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj index 70772cf0b53d8f..5d549749908f40 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj index c5e98f0f768b5e..9b5689ce3d0770 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj index 87320d4ad33730..664c3a975dffb2 100644 --- a/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/tostring_d.csproj b/src/tests/JIT/Directed/nullabletypes/tostring_d.csproj index ef877a15c74cee..ea1b5b84a4ff80 100644 --- a/src/tests/JIT/Directed/nullabletypes/tostring_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/tostring_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/tostring_do.csproj b/src/tests/JIT/Directed/nullabletypes/tostring_do.csproj index aa1e67040eec79..a92e85b4620245 100644 --- a/src/tests/JIT/Directed/nullabletypes/tostring_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/tostring_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/tostring_r.csproj b/src/tests/JIT/Directed/nullabletypes/tostring_r.csproj index 17f76b2af85be5..7097390ac2ad57 100644 --- a/src/tests/JIT/Directed/nullabletypes/tostring_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/tostring_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/tostring_ro.csproj b/src/tests/JIT/Directed/nullabletypes/tostring_ro.csproj index ef1647f78cc50f..9b1af1eca9c5fe 100644 --- a/src/tests/JIT/Directed/nullabletypes/tostring_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/tostring_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/nullabletypes/unboxnullable.cs b/src/tests/JIT/Directed/nullabletypes/unboxnullable.cs index bdfe07c39145cf..a6a6aca68ab8c2 100644 --- a/src/tests/JIT/Directed/nullabletypes/unboxnullable.cs +++ b/src/tests/JIT/Directed/nullabletypes/unboxnullable.cs @@ -2,10 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; public class Program { - private static int Main() + [Fact] + public static int TestEntryPoint() { try { diff --git a/src/tests/JIT/Directed/nullabletypes/unboxnullable_d.csproj b/src/tests/JIT/Directed/nullabletypes/unboxnullable_d.csproj index c0650ff2374578..472f2e0a6f7098 100644 --- a/src/tests/JIT/Directed/nullabletypes/unboxnullable_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/unboxnullable_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/nullabletypes/unboxnullable_do.csproj b/src/tests/JIT/Directed/nullabletypes/unboxnullable_do.csproj index ac44b38a13bf08..c55fcdf0a4918e 100644 --- a/src/tests/JIT/Directed/nullabletypes/unboxnullable_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/unboxnullable_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/nullabletypes/unboxnullable_r.csproj b/src/tests/JIT/Directed/nullabletypes/unboxnullable_r.csproj index 0b3805a811890f..362d304aa013b2 100644 --- a/src/tests/JIT/Directed/nullabletypes/unboxnullable_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/unboxnullable_r.csproj @@ -1,7 +1,4 @@ - - Exe - None diff --git a/src/tests/JIT/Directed/nullabletypes/unboxnullable_ro.csproj b/src/tests/JIT/Directed/nullabletypes/unboxnullable_ro.csproj index ff0c147ac9d7b2..6d4fbcc0f6dfb0 100644 --- a/src/tests/JIT/Directed/nullabletypes/unboxnullable_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/unboxnullable_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None diff --git a/src/tests/JIT/Directed/nullabletypes/value_d.csproj b/src/tests/JIT/Directed/nullabletypes/value_d.csproj index d348b684c9eeba..4333450040364b 100644 --- a/src/tests/JIT/Directed/nullabletypes/value_d.csproj +++ b/src/tests/JIT/Directed/nullabletypes/value_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/nullabletypes/value_do.csproj b/src/tests/JIT/Directed/nullabletypes/value_do.csproj index 0261dbe92cd2cf..236bf1fdc5d2b7 100644 --- a/src/tests/JIT/Directed/nullabletypes/value_do.csproj +++ b/src/tests/JIT/Directed/nullabletypes/value_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/nullabletypes/value_r.csproj b/src/tests/JIT/Directed/nullabletypes/value_r.csproj index 99cf7ce6ae94dd..1b949577452b65 100644 --- a/src/tests/JIT/Directed/nullabletypes/value_r.csproj +++ b/src/tests/JIT/Directed/nullabletypes/value_r.csproj @@ -1,7 +1,4 @@ - - Exe - None diff --git a/src/tests/JIT/Directed/nullabletypes/value_ro.csproj b/src/tests/JIT/Directed/nullabletypes/value_ro.csproj index c42a7f892be309..b507082b55b003 100644 --- a/src/tests/JIT/Directed/nullabletypes/value_ro.csproj +++ b/src/tests/JIT/Directed/nullabletypes/value_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None diff --git a/src/tests/JIT/Directed/perffix/commutativecse/CCSE.cs b/src/tests/JIT/Directed/perffix/commutativecse/CCSE.cs index 43f74abd94cd34..817b0843d7d59d 100644 --- a/src/tests/JIT/Directed/perffix/commutativecse/CCSE.cs +++ b/src/tests/JIT/Directed/perffix/commutativecse/CCSE.cs @@ -2,12 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -internal class CCSE +using Xunit; +public class CCSE { private static volatile uint s_source = 4; private static volatile uint s_sink1 = 0; private static volatile uint s_sink2 = 0; - private static int Main() + [Fact] + public static int TestEntryPoint() { uint v1 = s_source; uint v2 = s_source; diff --git a/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj b/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj index 9ec7a9a2e7a211..3e211f32971292 100644 --- a/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj +++ b/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj b/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj index 054e855290c70d..7b48178b311a35 100644 --- a/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj +++ b/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj b/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj index e39c17393ff0a5..b2cbd11acfef47 100644 --- a/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj +++ b/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj b/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj index d8140fc007cde4..ea7779dc182581 100644 --- a/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj +++ b/src/tests/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv1.cs b/src/tests/JIT/Directed/perffix/primitivevt/callconv1.cs index ca013c8ed7a1ff..bafa9137025b61 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv1.cs +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv1.cs @@ -2,10 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; namespace PrimitiveVT { - internal unsafe class CallConv1 + public unsafe class CallConv1 { public const int DefaultSeed = 20010415; public static int Seed = Environment.GetEnvironmentVariable("CORECLR_SEED") switch @@ -35,7 +36,8 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed, private int f10(params VT1B[] args) { int sum = 0; for (int i = 0; i < args.Length; sum += args[i], i++) { }; return sum; } - private static int Main() + [Fact] + public static int TestEntryPoint() { int a = s_rand.Next(); diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_d.csproj similarity index 93% rename from src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj rename to src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_d.csproj index c8970628e885ee..593f241ca0968a 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_do.csproj similarity index 93% rename from src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj rename to src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_do.csproj index 80c3f596065a9b..5adbd19844b7cc 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_r.csproj similarity index 93% rename from src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj rename to src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_r.csproj index 4f40180098e562..622c345ddd5a56 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_ro.csproj similarity index 93% rename from src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj rename to src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_ro.csproj index 4fea337956ab27..503fd57be32110 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv1_perffix_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv2.cs b/src/tests/JIT/Directed/perffix/primitivevt/callconv2.cs index fd673bc0505f0f..013b57aff6dc46 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv2.cs +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv2.cs @@ -2,10 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; namespace PrimitiveVT { - internal unsafe class CallConv2 + public unsafe class CallConv2 { public const int DefaultSeed = 20010415; public static int Seed = Environment.GetEnvironmentVariable("CORECLR_SEED") switch @@ -35,7 +36,8 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed, private uint f10(params VT2B[] args) { uint sum = 0; for (uint i = 0; i < args.Length; sum += args[i], i++) { }; return sum; } - private static int Main() + [Fact] + public static int TestEntryPoint() { uint a = (uint)s_rand.Next(); diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_d.csproj similarity index 93% rename from src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj rename to src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_d.csproj index d5a38763dc1a53..0afd4df87acd9d 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_do.csproj similarity index 93% rename from src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj rename to src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_do.csproj index 251907cace64a2..3c2e6d13832042 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_r.csproj similarity index 93% rename from src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj rename to src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_r.csproj index aeb65b1933f674..353921da02eea5 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_ro.csproj similarity index 93% rename from src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj rename to src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_ro.csproj index 9502f9ebbd9224..de470d1085aa4d 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv2_perffix_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3.il b/src/tests/JIT/Directed/perffix/primitivevt/callconv3.il index 0ede6779c6b66c..69e587ec0128df 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv3.il +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv3.il @@ -12,7 +12,7 @@ .assembly callconv3 {} .namespace PrimitiveVT { - .class private auto ansi beforefieldinit CallConv3 + .class public auto ansi beforefieldinit CallConv3 extends [mscorlib]System.Object { .field private static class [mscorlib]System.Random rand @@ -263,8 +263,7 @@ IL_002d: ret } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj index 3b8aabbb81a230..2e818485f29aef 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj index 67214829feecef..f07caf71ab98a7 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3.il b/src/tests/JIT/Directed/perffix/primitivevt/identity3.il index 9e9a6c2ac367b0..6c70c189d75517 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/identity3.il +++ b/src/tests/JIT/Directed/perffix/primitivevt/identity3.il @@ -12,14 +12,13 @@ .assembly identity3 {} .namespace PrimitiveVT { - .class private auto ansi beforefieldinit Identity3 + .class public auto ansi beforefieldinit Identity3 extends [mscorlib]System.Object { .field private static class [mscorlib]System.Random rand .field private valuetype [nativeinthelper]PrimitiveVT.VT1A vt1a .field private static valuetype [nativeinthelper]PrimitiveVT.VT1A x - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj index 0bbf06feddb12e..a53ffbe98d1337 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj index c66e341237ca5d..85bbdfc7fd3998 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly False diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed1.cs b/src/tests/JIT/Directed/perffix/primitivevt/mixed1.cs index bc5f2823ac821c..e0d74160154c11 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed1.cs +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed1.cs @@ -1,7 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System; -unsafe class testout1 +using Xunit; +public unsafe class testout1 { public struct VT_0_4_4_4 @@ -1693,7 +1694,8 @@ public static double Func_0() return retval_0; } - public static int Main() + [Fact] + public static int TestEntryPoint() { arr1d_0[0] = -0.0224609375; diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj b/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj index 01e923f279a8c7..ce78f7dd8cf403 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj b/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj index cbe12116ef939d..fb7e59790db10f 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj b/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj index 15e25ea12263dc..3bcefab6220431 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj b/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj index 9c1cd4f632c053..544fe7a84b5f8f 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed2.cs b/src/tests/JIT/Directed/perffix/primitivevt/mixed2.cs index d0ad4e19915349..7699ce99419525 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed2.cs +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed2.cs @@ -2,7 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -internal unsafe class testout1 +using Xunit; +public unsafe class testout1 { public struct VT_0_1_1_1_1_1 { @@ -234,7 +235,8 @@ public static int Func_0() return retval_0; } - public static int Main() + [Fact] + public static int TestEntryPoint() { s_arr3d_0[4, 0, 3] = 112.75552824827484409018782981M; diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj b/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj index 47e5bd2be46815..3bac8525408c84 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj b/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj index 6e778ccbd9f6e2..6007ac2cfe88dd 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj b/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj index c0539504f3f3db..318e3db1f329b6 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj b/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj index de22c7242202bd..351c5a5ca54bb8 100644 --- a/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj +++ b/src/tests/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il b/src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il index 634e62d5c89a7d..61bbde3486803c 100644 --- a/src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il +++ b/src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il @@ -6,7 +6,7 @@ } .assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly 'Object-Pin' +.assembly 'object-pin_' { } @@ -84,7 +84,7 @@ LOOP1: } -.class auto ansi Pin1_Test +.class public auto ansi Pin1_Test { .method public static pinvokeimpl("mirror" winapi) int32 Ret_Ptr(void *) il managed preservesig{ } .method public static pinvokeimpl("mirror" winapi) void Set_Val(void*,int32 c) il managed preservesig { } diff --git a/src/tests/JIT/Directed/pinning/object-pin/object-pin.ilproj b/src/tests/JIT/Directed/pinning/object-pin/object-pin_.ilproj similarity index 77% rename from src/tests/JIT/Directed/pinning/object-pin/object-pin.ilproj rename to src/tests/JIT/Directed/pinning/object-pin/object-pin_.ilproj index c774fe48c1ebf9..983a979a2ea864 100644 --- a/src/tests/JIT/Directed/pinning/object-pin/object-pin.ilproj +++ b/src/tests/JIT/Directed/pinning/object-pin/object-pin_.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 diff --git a/src/tests/JIT/Directed/pinvoke/calli_excep.il b/src/tests/JIT/Directed/pinvoke/calli_excep.il index 9cb52b3cf30533..ad59c0107f8149 100644 --- a/src/tests/JIT/Directed/pinvoke/calli_excep.il +++ b/src/tests/JIT/Directed/pinvoke/calli_excep.il @@ -12,7 +12,7 @@ .assembly calli_excep { } .namespace JitTest { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static pinvokeimpl("kernel32" winapi) @@ -22,8 +22,7 @@ native uint argsPtr) cil managed preservesig { } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/pinvoke/calli_excep.ilproj b/src/tests/JIT/Directed/pinvoke/calli_excep.ilproj index 44d99e73cdae1f..b5524abdb4546a 100644 --- a/src/tests/JIT/Directed/pinvoke/calli_excep.ilproj +++ b/src/tests/JIT/Directed/pinvoke/calli_excep.ilproj @@ -1,6 +1,7 @@ - Exe + + true true true diff --git a/src/tests/JIT/Directed/pinvoke/jump.il b/src/tests/JIT/Directed/pinvoke/jump.il index cc5ce795fa8dfc..c99e829584271d 100644 --- a/src/tests/JIT/Directed/pinvoke/jump.il +++ b/src/tests/JIT/Directed/pinvoke/jump.il @@ -11,7 +11,7 @@ .assembly jump { } .namespace JitTest { - .class private sequential ansi sealed beforefieldinit SYSTEM_INFO + .class public sequential ansi sealed beforefieldinit SYSTEM_INFO extends [mscorlib]System.ValueType { .field private unsigned int32 dwOemId @@ -35,8 +35,7 @@ call void [System.Console]System.Console::WriteLine(string) jmp void JitTest.SYSTEM_INFO::GetSystemInfo(valuetype JitTest.SYSTEM_INFO& si) } - .method public hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/pinvoke/jump.ilproj b/src/tests/JIT/Directed/pinvoke/jump.ilproj index 023e96e86fdfe6..883d2eefe1b3c4 100644 --- a/src/tests/JIT/Directed/pinvoke/jump.ilproj +++ b/src/tests/JIT/Directed/pinvoke/jump.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/pinvoke/pinvoke-bug.cs b/src/tests/JIT/Directed/pinvoke/pinvoke-bug.cs index 7cbdf001cc0161..7658eb499be0c9 100644 --- a/src/tests/JIT/Directed/pinvoke/pinvoke-bug.cs +++ b/src/tests/JIT/Directed/pinvoke/pinvoke-bug.cs @@ -3,13 +3,14 @@ using System; using System.Runtime.InteropServices; +using Xunit; // Test includes an intentional unreachable return #pragma warning disable 162 namespace PInvokeTest { - internal class Test + public class Test { [DllImport("msvcrt", EntryPoint = "sin", CallingConvention = CallingConvention.Cdecl)] private static extern double sin(double x); @@ -17,7 +18,8 @@ internal class Test private static double g; private static bool b; - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = false; g = 0.0; diff --git a/src/tests/JIT/Directed/pinvoke/pinvoke-bug.csproj b/src/tests/JIT/Directed/pinvoke/pinvoke-bug.csproj index 62ef4203e994f6..933564b6e8fa67 100644 --- a/src/tests/JIT/Directed/pinvoke/pinvoke-bug.csproj +++ b/src/tests/JIT/Directed/pinvoke/pinvoke-bug.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/pinvoke/pinvoke-examples.cs b/src/tests/JIT/Directed/pinvoke/pinvoke-examples.cs index 6cb15030b9e715..1af9c0f2190ca1 100644 --- a/src/tests/JIT/Directed/pinvoke/pinvoke-examples.cs +++ b/src/tests/JIT/Directed/pinvoke/pinvoke-examples.cs @@ -8,6 +8,7 @@ using System.Threading; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Xunit; namespace PInvokeTest @@ -23,7 +24,7 @@ public static int GetConstant() private extern static int GetConstantInternal(); } - internal class Test + public class Test { [MethodImpl(MethodImplOptions.AggressiveInlining)] static int AsForceInline() @@ -214,7 +215,8 @@ static bool FromColdCode() return result1 && result2; } - private static int Main() + [Fact] + public static int TestEntryPoint() { bool result = true; diff --git a/src/tests/JIT/Directed/pinvoke/pinvoke-examples.csproj b/src/tests/JIT/Directed/pinvoke/pinvoke-examples.csproj index 5b9fe4bfe6c315..6b5947423201e8 100644 --- a/src/tests/JIT/Directed/pinvoke/pinvoke-examples.csproj +++ b/src/tests/JIT/Directed/pinvoke/pinvoke-examples.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il b/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il index 71cdbf78d35724..5758d7cbcf8b1d 100644 --- a/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il +++ b/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il @@ -15,7 +15,6 @@ .hash algorithm 0x00008004 .ver 0:0:0:0 } -.module preemptive_cooperative.exe .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 @@ -24,7 +23,7 @@ -.class private auto ansi beforefieldinit Repro +.class public auto ansi beforefieldinit Repro extends [mscorlib]System.Object { .field private static class [mscorlib]System.Threading.EventWaitHandle e1 @@ -164,8 +163,7 @@ IL_0045: ret } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.ilproj b/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.ilproj index 1e653680c6d36a..4f8c34a3491625 100644 --- a/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.ilproj +++ b/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/pinvoke/sin.cs b/src/tests/JIT/Directed/pinvoke/sin.cs index c2a2ed045478d6..aee1f1f74d0900 100644 --- a/src/tests/JIT/Directed/pinvoke/sin.cs +++ b/src/tests/JIT/Directed/pinvoke/sin.cs @@ -1,13 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Xunit; namespace JitTest { using System; using System.Text; using System.Runtime.InteropServices; - internal class Test + public class Test { [DllImport("msvcrt", EntryPoint = "sin", CallingConvention = CallingConvention.Cdecl)] private static extern double sin(double x); @@ -15,7 +16,8 @@ internal class Test [DllImport("msvcrt", EntryPoint = "acos", CallingConvention = CallingConvention.Cdecl)] private static extern double acos(double x); - private static int Main() + [Fact] + public static int TestEntryPoint() { for (double x = 0.0; x <= 3.1415926535897; x += 0.14) { diff --git a/src/tests/JIT/Directed/pinvoke/sin.csproj b/src/tests/JIT/Directed/pinvoke/sin.csproj index 9585f0c749b717..87a8a31a7ff514 100644 --- a/src/tests/JIT/Directed/pinvoke/sin.csproj +++ b/src/tests/JIT/Directed/pinvoke/sin.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/pinvoke/sysinfo.cs b/src/tests/JIT/Directed/pinvoke/sysinfo.cs index d64818ad15ff36..9336d6f12a3992 100644 --- a/src/tests/JIT/Directed/pinvoke/sysinfo.cs +++ b/src/tests/JIT/Directed/pinvoke/sysinfo.cs @@ -1,13 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Xunit; namespace JitTest { using System; using System.Runtime.InteropServices; [StructLayout(LayoutKind.Sequential)] - internal struct SYSTEM_INFO + public struct SYSTEM_INFO { private uint _dwOemId; private uint _dwPageSize; @@ -23,7 +24,8 @@ internal struct SYSTEM_INFO [DllImport("kernel32", CharSet = CharSet.Ansi)] public extern static void GetSystemInfo(ref SYSTEM_INFO si); - public static int Main() + [Fact] + public static int TestEntryPoint() { SYSTEM_INFO si = new SYSTEM_INFO(); try diff --git a/src/tests/JIT/Directed/pinvoke/sysinfo.il b/src/tests/JIT/Directed/pinvoke/sysinfo.il index c9d2279c2156a5..c392056b9b5be6 100644 --- a/src/tests/JIT/Directed/pinvoke/sysinfo.il +++ b/src/tests/JIT/Directed/pinvoke/sysinfo.il @@ -8,11 +8,10 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly sysinfo { } -.module sysinfo.exe +.assembly 'sysinfo_il' { } .namespace JitTest { - .class private sequential ansi sealed beforefieldinit SYSTEM_INFO + .class public sequential ansi sealed beforefieldinit SYSTEM_INFO extends [mscorlib]System.ValueType { .field private unsigned int32 dwOemId @@ -29,8 +28,7 @@ void GetSystemInfo(valuetype JitTest.SYSTEM_INFO& si) cil managed preservesig { } - .method public hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/pinvoke/sysinfo_cs.csproj b/src/tests/JIT/Directed/pinvoke/sysinfo_cs.csproj index 9f26dac7276c22..256010d5b51b81 100644 --- a/src/tests/JIT/Directed/pinvoke/sysinfo_cs.csproj +++ b/src/tests/JIT/Directed/pinvoke/sysinfo_cs.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/pinvoke/sysinfo_il.ilproj b/src/tests/JIT/Directed/pinvoke/sysinfo_il.ilproj index bb0bdb80a60e09..edc9350926de21 100644 --- a/src/tests/JIT/Directed/pinvoke/sysinfo_il.ilproj +++ b/src/tests/JIT/Directed/pinvoke/sysinfo_il.ilproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Directed/pinvoke/tail.il b/src/tests/JIT/Directed/pinvoke/tail.il index 1629d1d1be534f..dfec04708f9a0c 100644 --- a/src/tests/JIT/Directed/pinvoke/tail.il +++ b/src/tests/JIT/Directed/pinvoke/tail.il @@ -9,10 +9,10 @@ .assembly extern xunit.core {} .assembly extern mscorlib { } -.assembly 'tail' { } +.assembly 'tail_pinvoke' { } .namespace JitTest { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { .method private hidebysig static pinvokeimpl("PInvokeExampleNative" ansi winapi) @@ -94,8 +94,7 @@ unsigned int32) } - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/pinvoke/tail.ilproj b/src/tests/JIT/Directed/pinvoke/tail_pinvoke.ilproj similarity index 77% rename from src/tests/JIT/Directed/pinvoke/tail.ilproj rename to src/tests/JIT/Directed/pinvoke/tail_pinvoke.ilproj index 0b7cd5c1ca43fc..f83cfbe2e2b2e4 100644 --- a/src/tests/JIT/Directed/pinvoke/tail.ilproj +++ b/src/tests/JIT/Directed/pinvoke/tail_pinvoke.ilproj @@ -1,6 +1,7 @@ - Exe + + true true diff --git a/src/tests/JIT/Directed/refbyref/byref2iu.il b/src/tests/JIT/Directed/refbyref/byref2iu.il index 0cf9a01b2463b7..5b866e5062ad75 100644 --- a/src/tests/JIT/Directed/refbyref/byref2iu.il +++ b/src/tests/JIT/Directed/refbyref/byref2iu.il @@ -6,11 +6,16 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} .assembly byref2iu {} .field static char c +.class public auto ansi byref2iu { .method public static int32 Main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 10 .locals init (char& V_0, @@ -153,3 +158,4 @@ ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/refbyref/byref2iu_il_d.ilproj b/src/tests/JIT/Directed/refbyref/byref2iu_il_d.ilproj index bc2417fa255b5a..955702aed096d1 100644 --- a/src/tests/JIT/Directed/refbyref/byref2iu_il_d.ilproj +++ b/src/tests/JIT/Directed/refbyref/byref2iu_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/byref2iu_il_r.ilproj b/src/tests/JIT/Directed/refbyref/byref2iu_il_r.ilproj index 02b166466892c6..7b32b41de1466b 100644 --- a/src/tests/JIT/Directed/refbyref/byref2iu_il_r.ilproj +++ b/src/tests/JIT/Directed/refbyref/byref2iu_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert.il b/src/tests/JIT/Directed/refbyref/byrefconvert.il index 4c741b635cddfd..e93c44f94a5bc8 100644 --- a/src/tests/JIT/Directed/refbyref/byrefconvert.il +++ b/src/tests/JIT/Directed/refbyref/byrefconvert.il @@ -2,15 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern legacy library mscorlib {} +.assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } .assembly byrefconvert {} -.module byrefconvert.exe +.class public auto ansi byrefconvert { .method public static int32 Main() cil managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 2 .locals init (string V_0, @@ -26,3 +30,4 @@ ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert_il_d.ilproj b/src/tests/JIT/Directed/refbyref/byrefconvert_il_d.ilproj index b381cdccba4a05..613358453e0217 100644 --- a/src/tests/JIT/Directed/refbyref/byrefconvert_il_d.ilproj +++ b/src/tests/JIT/Directed/refbyref/byrefconvert_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert_il_r.ilproj b/src/tests/JIT/Directed/refbyref/byrefconvert_il_r.ilproj index 4e143ed488caca..c69628a6d382ef 100644 --- a/src/tests/JIT/Directed/refbyref/byrefconvert_il_r.ilproj +++ b/src/tests/JIT/Directed/refbyref/byrefconvert_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/ref2byref.il b/src/tests/JIT/Directed/refbyref/ref2byref.il index b2a5b3dd37b14c..0b3b08e24fa8d9 100644 --- a/src/tests/JIT/Directed/refbyref/ref2byref.il +++ b/src/tests/JIT/Directed/refbyref/ref2byref.il @@ -6,10 +6,15 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} .assembly ref2byref {} +.class public auto ansi ref2byref { .method public static int32 Main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 10 .locals init (string V_0, @@ -99,3 +104,4 @@ ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/refbyref/ref2byref_il_d.ilproj b/src/tests/JIT/Directed/refbyref/ref2byref_il_d.ilproj index c00ddb74c25b05..57a097e55009b8 100644 --- a/src/tests/JIT/Directed/refbyref/ref2byref_il_d.ilproj +++ b/src/tests/JIT/Directed/refbyref/ref2byref_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/ref2byref_il_r.ilproj b/src/tests/JIT/Directed/refbyref/ref2byref_il_r.ilproj index d66b453a492c66..17098228b670c5 100644 --- a/src/tests/JIT/Directed/refbyref/ref2byref_il_r.ilproj +++ b/src/tests/JIT/Directed/refbyref/ref2byref_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/ref2iu.il b/src/tests/JIT/Directed/refbyref/ref2iu.il index a7669a019b8084..ae0bc2e0d7a89e 100644 --- a/src/tests/JIT/Directed/refbyref/ref2iu.il +++ b/src/tests/JIT/Directed/refbyref/ref2iu.il @@ -6,10 +6,15 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} .assembly ref2iu {} +.class public auto ansi ref2iu { .method public static int32 Main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 10 .locals init (object V_0, @@ -99,3 +104,4 @@ ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/refbyref/ref2iu_il_d.ilproj b/src/tests/JIT/Directed/refbyref/ref2iu_il_d.ilproj index c9b176b233e34a..b41b766efae4e0 100644 --- a/src/tests/JIT/Directed/refbyref/ref2iu_il_d.ilproj +++ b/src/tests/JIT/Directed/refbyref/ref2iu_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/ref2iu_il_r.ilproj b/src/tests/JIT/Directed/refbyref/ref2iu_il_r.ilproj index b16e6bf685014a..1a90c13cc9c46a 100644 --- a/src/tests/JIT/Directed/refbyref/ref2iu_il_r.ilproj +++ b/src/tests/JIT/Directed/refbyref/ref2iu_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu.il b/src/tests/JIT/Directed/refbyref/refpinned2iu.il index 16a2312f9c8a53..f9dda179c3d71f 100644 --- a/src/tests/JIT/Directed/refbyref/refpinned2iu.il +++ b/src/tests/JIT/Directed/refbyref/refpinned2iu.il @@ -6,10 +6,15 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern xunit.core {} .assembly extern legacy library mscorlib {} -.assembly ref2iu {} +.assembly 'refpinned2iu' {} +.class public auto ansi refpinned2iu { .method public static int32 Main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 10 .locals init (object pinned V_0, @@ -109,3 +114,4 @@ ldc.i4 100 ret } +} diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj b/src/tests/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj index 6c0daaaf11f94d..5447d81846d9da 100644 --- a/src/tests/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj +++ b/src/tests/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj b/src/tests/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj index a47a7786f7954c..f83d611082d88d 100644 --- a/src/tests/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj +++ b/src/tests/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.il b/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.il index 5d850d1dbf8da9..aa890a596d07b5 100644 --- a/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.il +++ b/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.il @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -.assembly extern System.Runtime { } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern xunit.core {} .assembly extern System.Runtime.Extensions { } .assembly extern System.Console { } @@ -10,11 +10,10 @@ // =============== CLASS MEMBERS DECLARATION =================== -.class private auto ansi beforefieldinit RVAOrderingTest +.class public auto ansi beforefieldinit RVAOrderingTest extends [System.Runtime]System.Object { - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.ilproj b/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.ilproj index 84289b19116fb0..eb2a6d94c73b91 100644 --- a/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.ilproj +++ b/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic1.il b/src/tests/JIT/Directed/rvastatics/rvastatic1.il index ef63240c630125..bf9948bf668414 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic1.il +++ b/src/tests/JIT/Directed/rvastatics/rvastatic1.il @@ -7074,7 +7074,7 @@ a010126: throw a010127: ret} - .method static int32 Main(){.entrypoint .maxstack 5 + .method public static int32 Main(){.entrypoint .maxstack 5 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic1.ilproj b/src/tests/JIT/Directed/rvastatics/rvastatic1.ilproj index fbbc35681d4179..f59d29dcb46d0e 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic1.ilproj +++ b/src/tests/JIT/Directed/rvastatics/rvastatic1.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic2.il b/src/tests/JIT/Directed/rvastatics/rvastatic2.il index 9fdc68e4e532aa..bb705d1ed1ebcd 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic2.il +++ b/src/tests/JIT/Directed/rvastatics/rvastatic2.il @@ -7087,7 +7087,7 @@ a010126: throw a010127: ret} - .method static int32 Main(){.entrypoint .maxstack 5 + .method public static int32 Main(){.entrypoint .maxstack 5 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic2.ilproj b/src/tests/JIT/Directed/rvastatics/rvastatic2.ilproj index ba7d95392075e0..fb54c95c7b3e82 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic2.ilproj +++ b/src/tests/JIT/Directed/rvastatics/rvastatic2.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic3.il b/src/tests/JIT/Directed/rvastatics/rvastatic3.il index 5c65f3dd1d4454..dfd5c8f219fc4b 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic3.il +++ b/src/tests/JIT/Directed/rvastatics/rvastatic3.il @@ -7089,7 +7089,7 @@ a010126: throw a010127: ret} - .method static int32 Main(){.entrypoint .maxstack 5 + .method public static int32 Main(){.entrypoint .maxstack 5 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic3.ilproj b/src/tests/JIT/Directed/rvastatics/rvastatic3.ilproj index e38408e011c4c7..b65a2459cd1e02 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic3.ilproj +++ b/src/tests/JIT/Directed/rvastatics/rvastatic3.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic4.il b/src/tests/JIT/Directed/rvastatics/rvastatic4.il index c3872934767784..cb837e5a3193fd 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic4.il +++ b/src/tests/JIT/Directed/rvastatics/rvastatic4.il @@ -7082,7 +7082,7 @@ a010126: throw a010127: ret} - .method static int32 Main(){.entrypoint .maxstack 5 + .method public static int32 Main(){.entrypoint .maxstack 5 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic4.ilproj b/src/tests/JIT/Directed/rvastatics/rvastatic4.ilproj index ff47bcbb5a5ef2..4747e347c75c33 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic4.ilproj +++ b/src/tests/JIT/Directed/rvastatics/rvastatic4.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic5.il b/src/tests/JIT/Directed/rvastatics/rvastatic5.il index bfceb0e1e1de05..50f26e8c963c05 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic5.il +++ b/src/tests/JIT/Directed/rvastatics/rvastatic5.il @@ -7066,7 +7066,7 @@ a010126: throw a010127: ret} - .method static int32 Main(){.entrypoint .maxstack 5 + .method public static int32 Main(){.entrypoint .maxstack 5 .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) diff --git a/src/tests/JIT/Directed/rvastatics/rvastatic5.ilproj b/src/tests/JIT/Directed/rvastatics/rvastatic5.ilproj index b272a35b7a8529..454a4912e09664 100644 --- a/src/tests/JIT/Directed/rvastatics/rvastatic5.ilproj +++ b/src/tests/JIT/Directed/rvastatics/rvastatic5.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/shift/int16.cs b/src/tests/JIT/Directed/shift/int16.cs index 82bd09585b9ffb..f90b607239021a 100644 --- a/src/tests/JIT/Directed/shift/int16.cs +++ b/src/tests/JIT/Directed/shift/int16.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; namespace ShiftTest { @@ -27,7 +28,8 @@ public static short f2(short arg_data) arg_data <<= 4; return arg_data; } - public static int Main() + [Fact] + public static int TestEntryPoint() { short loc_data = 0x7FFF; diff --git a/src/tests/JIT/Directed/shift/int16_cs_d.csproj b/src/tests/JIT/Directed/shift/int16_cs_d.csproj index 65a52aae2bb456..f41543e91afff0 100644 --- a/src/tests/JIT/Directed/shift/int16_cs_d.csproj +++ b/src/tests/JIT/Directed/shift/int16_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int16_cs_do.csproj b/src/tests/JIT/Directed/shift/int16_cs_do.csproj index 3ad078ba23b298..c48dfc58fa1b6c 100644 --- a/src/tests/JIT/Directed/shift/int16_cs_do.csproj +++ b/src/tests/JIT/Directed/shift/int16_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int16_cs_r.csproj b/src/tests/JIT/Directed/shift/int16_cs_r.csproj index e985871f077e5e..4bc4749799b4ee 100644 --- a/src/tests/JIT/Directed/shift/int16_cs_r.csproj +++ b/src/tests/JIT/Directed/shift/int16_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int16_cs_ro.csproj b/src/tests/JIT/Directed/shift/int16_cs_ro.csproj index e854436ceba5b9..7d05a264ec8b9c 100644 --- a/src/tests/JIT/Directed/shift/int16_cs_ro.csproj +++ b/src/tests/JIT/Directed/shift/int16_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int16_d.csproj b/src/tests/JIT/Directed/shift/int16_d.csproj deleted file mode 100644 index af5c1466b53cf8..00000000000000 --- a/src/tests/JIT/Directed/shift/int16_d.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - False - - - - - diff --git a/src/tests/JIT/Directed/shift/int16_do.csproj b/src/tests/JIT/Directed/shift/int16_do.csproj deleted file mode 100644 index 949ed70a4bae96..00000000000000 --- a/src/tests/JIT/Directed/shift/int16_do.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - True - - - - - diff --git a/src/tests/JIT/Directed/shift/int16_r.csproj b/src/tests/JIT/Directed/shift/int16_r.csproj index a403bd18de71bb..504c60fa275cdf 100644 --- a/src/tests/JIT/Directed/shift/int16_r.csproj +++ b/src/tests/JIT/Directed/shift/int16_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int16_ro.csproj b/src/tests/JIT/Directed/shift/int16_ro.csproj index 9c3b80b1b56baf..046cae5c16bd32 100644 --- a/src/tests/JIT/Directed/shift/int16_ro.csproj +++ b/src/tests/JIT/Directed/shift/int16_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int32.cs b/src/tests/JIT/Directed/shift/int32.cs index d829c20e06046b..6fae92c997a6c0 100644 --- a/src/tests/JIT/Directed/shift/int32.cs +++ b/src/tests/JIT/Directed/shift/int32.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; namespace ShiftTest { @@ -27,7 +28,8 @@ public static int f2(int arg_data) arg_data <<= 4; return arg_data; } - public static int Main() + [Fact] + public static int TestEntryPoint() { int loc_data = 0x7FFFFFFF; diff --git a/src/tests/JIT/Directed/shift/int32_cs_d.csproj b/src/tests/JIT/Directed/shift/int32_cs_d.csproj index 4ae1a6821ba6c8..2dad18d2666756 100644 --- a/src/tests/JIT/Directed/shift/int32_cs_d.csproj +++ b/src/tests/JIT/Directed/shift/int32_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int32_cs_do.csproj b/src/tests/JIT/Directed/shift/int32_cs_do.csproj index d0f4dc54aee416..c3111ebcf133cc 100644 --- a/src/tests/JIT/Directed/shift/int32_cs_do.csproj +++ b/src/tests/JIT/Directed/shift/int32_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int32_cs_r.csproj b/src/tests/JIT/Directed/shift/int32_cs_r.csproj index d3c18ebfb4b447..58c5761e60fff5 100644 --- a/src/tests/JIT/Directed/shift/int32_cs_r.csproj +++ b/src/tests/JIT/Directed/shift/int32_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int32_cs_ro.csproj b/src/tests/JIT/Directed/shift/int32_cs_ro.csproj index 2cafc530a26a39..127b1b02b5d51f 100644 --- a/src/tests/JIT/Directed/shift/int32_cs_ro.csproj +++ b/src/tests/JIT/Directed/shift/int32_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int32_d.csproj b/src/tests/JIT/Directed/shift/int32_d.csproj deleted file mode 100644 index e00a7ca65df3f9..00000000000000 --- a/src/tests/JIT/Directed/shift/int32_d.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - False - - - - - diff --git a/src/tests/JIT/Directed/shift/int32_do.csproj b/src/tests/JIT/Directed/shift/int32_do.csproj deleted file mode 100644 index e2ec889b0c7023..00000000000000 --- a/src/tests/JIT/Directed/shift/int32_do.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - True - - - - - diff --git a/src/tests/JIT/Directed/shift/int32_r.csproj b/src/tests/JIT/Directed/shift/int32_r.csproj index efb5c4b737030d..38a64e66b053f3 100644 --- a/src/tests/JIT/Directed/shift/int32_r.csproj +++ b/src/tests/JIT/Directed/shift/int32_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int32_ro.csproj b/src/tests/JIT/Directed/shift/int32_ro.csproj index d68a6f5fc5288c..b92c75753070b9 100644 --- a/src/tests/JIT/Directed/shift/int32_ro.csproj +++ b/src/tests/JIT/Directed/shift/int32_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int64.cs b/src/tests/JIT/Directed/shift/int64.cs index ab86cf929f1be6..fac1b3509d1b9f 100644 --- a/src/tests/JIT/Directed/shift/int64.cs +++ b/src/tests/JIT/Directed/shift/int64.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; namespace ShiftTest { @@ -27,7 +28,8 @@ public static long f2(long arg_data) arg_data <<= 8; return arg_data; } - public static int Main() + [Fact] + public static int TestEntryPoint() { long loc_data = 0x7FFFFFFFFFFFFFFF; diff --git a/src/tests/JIT/Directed/shift/int64_d.csproj b/src/tests/JIT/Directed/shift/int64_d.csproj index 5d2b48bc9639ec..9ff4c106c68169 100644 --- a/src/tests/JIT/Directed/shift/int64_d.csproj +++ b/src/tests/JIT/Directed/shift/int64_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int64_do.csproj b/src/tests/JIT/Directed/shift/int64_do.csproj index b83e1ce3b7ff84..b81eee8be1210f 100644 --- a/src/tests/JIT/Directed/shift/int64_do.csproj +++ b/src/tests/JIT/Directed/shift/int64_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int64_r.csproj b/src/tests/JIT/Directed/shift/int64_r.csproj index 8773dca2b5f07f..a06d291d1fc91a 100644 --- a/src/tests/JIT/Directed/shift/int64_r.csproj +++ b/src/tests/JIT/Directed/shift/int64_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int64_ro.csproj b/src/tests/JIT/Directed/shift/int64_ro.csproj index d31d8b0c08794a..05e46dc88a1e7f 100644 --- a/src/tests/JIT/Directed/shift/int64_ro.csproj +++ b/src/tests/JIT/Directed/shift/int64_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int8.il b/src/tests/JIT/Directed/shift/int8.il index 33241fc28b96f5..f054afae4102f6 100644 --- a/src/tests/JIT/Directed/shift/int8.il +++ b/src/tests/JIT/Directed/shift/int8.il @@ -21,47 +21,6 @@ .hash algorithm 0x00008004 .ver 0:0:0:0 } -// MVID: {DA4EAAAA-684F-4AB1-AC9B-90B895DBBD60} -.imagebase 0x00400000 -.subsystem 0x00000003 -.file alignment 512 -.corflags 0x00000001 -// Image base: 0x06e80000 -// -// ============== CLASS STRUCTURE DECLARATION ================== -// -.namespace ShiftTest -{ - .class public auto ansi beforefieldinit CL - extends [mscorlib]System.Object - { - } // end of class CL - - .class public sequential ansi sealed beforefieldinit VT - extends [mscorlib]System.ValueType - { - } // end of class VT - - .class public auto ansi beforefieldinit byte32Test - extends [mscorlib]System.Object - { - } // end of class byte32Test - -} // end of namespace ShiftTest - - -// ============================================================= - - -// =============== GLOBAL FIELDS AND METHODS =================== - - -// ============================================================= - - -// =============== CLASS MEMBERS DECLARATION =================== -// note that class flags, 'extends' and 'implements' clauses -// are provided here for information only .namespace ShiftTest { @@ -132,8 +91,7 @@ IL_000b: ret } // end of method byte32Test::f2 - .method public hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/shift/int8_il_d.ilproj b/src/tests/JIT/Directed/shift/int8_il_d.ilproj index ea83f29a833395..e9ed0680925a30 100644 --- a/src/tests/JIT/Directed/shift/int8_il_d.ilproj +++ b/src/tests/JIT/Directed/shift/int8_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/int8_il_r.ilproj b/src/tests/JIT/Directed/shift/int8_il_r.ilproj index 206964a448c950..a23587773813d4 100644 --- a/src/tests/JIT/Directed/shift/int8_il_r.ilproj +++ b/src/tests/JIT/Directed/shift/int8_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/nativeint.il b/src/tests/JIT/Directed/shift/nativeint.il index 2602f57f554f70..232ef7c95fbfe7 100644 --- a/src/tests/JIT/Directed/shift/nativeint.il +++ b/src/tests/JIT/Directed/shift/nativeint.il @@ -21,47 +21,6 @@ .hash algorithm 0x00008004 .ver 0:0:0:0 } -// MVID: {DA4EAAAA-684F-4AB1-AC9B-90B895DBBD60} -.imagebase 0x00400000 -.subsystem 0x00000003 -.file alignment 512 -.corflags 0x00000001 -// Image base: 0x06e80000 -// -// ============== CLASS STRUCTURE DECLARATION ================== -// -.namespace ShiftTest -{ - .class public auto ansi beforefieldinit CL - extends [mscorlib]System.Object - { - } // end of class CL - - .class public sequential ansi sealed beforefieldinit VT - extends [mscorlib]System.ValueType - { - } // end of class VT - - .class public auto ansi beforefieldinit byte32Test - extends [mscorlib]System.Object - { - } // end of class byte32Test - -} // end of namespace ShiftTest - - -// ============================================================= - - -// =============== GLOBAL FIELDS AND METHODS =================== - - -// ============================================================= - - -// =============== CLASS MEMBERS DECLARATION =================== -// note that class flags, 'extends' and 'implements' clauses -// are provided here for information only .namespace ShiftTest { @@ -132,8 +91,7 @@ IL_000b: ret } // end of method byte32Test::f2 - .method public hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/shift/nativeint_il_d.ilproj b/src/tests/JIT/Directed/shift/nativeint_il_d.ilproj index 3e66d9ab0ff152..b895ac4a94220f 100644 --- a/src/tests/JIT/Directed/shift/nativeint_il_d.ilproj +++ b/src/tests/JIT/Directed/shift/nativeint_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/nativeint_il_r.ilproj b/src/tests/JIT/Directed/shift/nativeint_il_r.ilproj index 84afe10a6e098a..04a0586e0a94bc 100644 --- a/src/tests/JIT/Directed/shift/nativeint_il_r.ilproj +++ b/src/tests/JIT/Directed/shift/nativeint_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/nativeuint.il b/src/tests/JIT/Directed/shift/nativeuint.il index 0b3861bd8b8c92..cccb946d6e908a 100644 --- a/src/tests/JIT/Directed/shift/nativeuint.il +++ b/src/tests/JIT/Directed/shift/nativeuint.il @@ -21,47 +21,6 @@ .hash algorithm 0x00008004 .ver 0:0:0:0 } -// MVID: {DA4EAAAA-684F-4AB1-AC9B-90B895DBBD60} -.imagebase 0x00400000 -.subsystem 0x00000003 -.file alignment 512 -.corflags 0x00000001 -// Image base: 0x06e80000 -// -// ============== CLASS STRUCTURE DECLARATION ================== -// -.namespace ShiftTest -{ - .class public auto ansi beforefieldinit CL - extends [mscorlib]System.Object - { - } // end of class CL - - .class public sequential ansi sealed beforefieldinit VT - extends [mscorlib]System.ValueType - { - } // end of class VT - - .class public auto ansi beforefieldinit byte32Test - extends [mscorlib]System.Object - { - } // end of class byte32Test - -} // end of namespace ShiftTest - - -// ============================================================= - - -// =============== GLOBAL FIELDS AND METHODS =================== - - -// ============================================================= - - -// =============== CLASS MEMBERS DECLARATION =================== -// note that class flags, 'extends' and 'implements' clauses -// are provided here for information only .namespace ShiftTest { @@ -132,8 +91,7 @@ IL_000b: ret } // end of method byte32Test::f2 - .method public hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/shift/nativeuint_il_d.ilproj b/src/tests/JIT/Directed/shift/nativeuint_il_d.ilproj index ad2bb19f55d85e..19fbb7e2d75a01 100644 --- a/src/tests/JIT/Directed/shift/nativeuint_il_d.ilproj +++ b/src/tests/JIT/Directed/shift/nativeuint_il_d.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/nativeuint_il_r.ilproj b/src/tests/JIT/Directed/shift/nativeuint_il_r.ilproj index 283309769d473b..7088f8a6ec2739 100644 --- a/src/tests/JIT/Directed/shift/nativeuint_il_r.ilproj +++ b/src/tests/JIT/Directed/shift/nativeuint_il_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint16.cs b/src/tests/JIT/Directed/shift/uint16.cs index e65f3392aa4f2f..8286acf46e50db 100644 --- a/src/tests/JIT/Directed/shift/uint16.cs +++ b/src/tests/JIT/Directed/shift/uint16.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; namespace ShiftTest { @@ -27,7 +28,8 @@ public static ushort f2(ushort arg_data) arg_data <<= 4; return arg_data; } - public static int Main() + [Fact] + public static int TestEntryPoint() { ushort loc_data = 0xFFFF; diff --git a/src/tests/JIT/Directed/shift/uint16_cs_d.csproj b/src/tests/JIT/Directed/shift/uint16_cs_d.csproj index 9e33e8078e2604..f1a831b71f1ee7 100644 --- a/src/tests/JIT/Directed/shift/uint16_cs_d.csproj +++ b/src/tests/JIT/Directed/shift/uint16_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint16_cs_do.csproj b/src/tests/JIT/Directed/shift/uint16_cs_do.csproj index de09b7437f9376..41519ddc80492c 100644 --- a/src/tests/JIT/Directed/shift/uint16_cs_do.csproj +++ b/src/tests/JIT/Directed/shift/uint16_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint16_cs_r.csproj b/src/tests/JIT/Directed/shift/uint16_cs_r.csproj index a0c0f42cfa2ada..8649be239b6fb9 100644 --- a/src/tests/JIT/Directed/shift/uint16_cs_r.csproj +++ b/src/tests/JIT/Directed/shift/uint16_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint16_cs_ro.csproj b/src/tests/JIT/Directed/shift/uint16_cs_ro.csproj index f45d958a93de80..d116b4993c4909 100644 --- a/src/tests/JIT/Directed/shift/uint16_cs_ro.csproj +++ b/src/tests/JIT/Directed/shift/uint16_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint16_d.csproj b/src/tests/JIT/Directed/shift/uint16_d.csproj deleted file mode 100644 index 009b7a37e71474..00000000000000 --- a/src/tests/JIT/Directed/shift/uint16_d.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - False - - - - - diff --git a/src/tests/JIT/Directed/shift/uint16_do.csproj b/src/tests/JIT/Directed/shift/uint16_do.csproj deleted file mode 100644 index daad4b9150ea44..00000000000000 --- a/src/tests/JIT/Directed/shift/uint16_do.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - True - - - - - diff --git a/src/tests/JIT/Directed/shift/uint16_r.csproj b/src/tests/JIT/Directed/shift/uint16_r.csproj index 5b7c0c98f52792..a7f9bf904b4eb5 100644 --- a/src/tests/JIT/Directed/shift/uint16_r.csproj +++ b/src/tests/JIT/Directed/shift/uint16_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint16_ro.csproj b/src/tests/JIT/Directed/shift/uint16_ro.csproj index a32333dc683e7a..cb5c10be10369a 100644 --- a/src/tests/JIT/Directed/shift/uint16_ro.csproj +++ b/src/tests/JIT/Directed/shift/uint16_ro.csproj @@ -1,7 +1,4 @@ - - Exe - True diff --git a/src/tests/JIT/Directed/shift/uint32.cs b/src/tests/JIT/Directed/shift/uint32.cs index e4135dc93fbc5d..5707fb45301544 100644 --- a/src/tests/JIT/Directed/shift/uint32.cs +++ b/src/tests/JIT/Directed/shift/uint32.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; namespace ShiftTest { @@ -27,7 +28,8 @@ public static uint f2(uint arg_data) arg_data <<= 4; return arg_data; } - public static int Main() + [Fact] + public static int TestEntryPoint() { uint loc_data = 0xFFFFFFFF; diff --git a/src/tests/JIT/Directed/shift/uint32_cs_d.csproj b/src/tests/JIT/Directed/shift/uint32_cs_d.csproj index b63ab62dc8496b..745f0b8e59a0aa 100644 --- a/src/tests/JIT/Directed/shift/uint32_cs_d.csproj +++ b/src/tests/JIT/Directed/shift/uint32_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint32_cs_do.csproj b/src/tests/JIT/Directed/shift/uint32_cs_do.csproj index 2dd6ddfdb0dc8b..187c4ed5697d54 100644 --- a/src/tests/JIT/Directed/shift/uint32_cs_do.csproj +++ b/src/tests/JIT/Directed/shift/uint32_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint32_cs_r.csproj b/src/tests/JIT/Directed/shift/uint32_cs_r.csproj index fd7f81da165e16..647980ae9fee3f 100644 --- a/src/tests/JIT/Directed/shift/uint32_cs_r.csproj +++ b/src/tests/JIT/Directed/shift/uint32_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint32_cs_ro.csproj b/src/tests/JIT/Directed/shift/uint32_cs_ro.csproj index 46f00b65bd43c0..710995464ff7e7 100644 --- a/src/tests/JIT/Directed/shift/uint32_cs_ro.csproj +++ b/src/tests/JIT/Directed/shift/uint32_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint32_d.csproj b/src/tests/JIT/Directed/shift/uint32_d.csproj deleted file mode 100644 index ae28c138b80ed9..00000000000000 --- a/src/tests/JIT/Directed/shift/uint32_d.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - False - - - - - diff --git a/src/tests/JIT/Directed/shift/uint32_do.csproj b/src/tests/JIT/Directed/shift/uint32_do.csproj deleted file mode 100644 index fd487f236c993a..00000000000000 --- a/src/tests/JIT/Directed/shift/uint32_do.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - True - - - - - diff --git a/src/tests/JIT/Directed/shift/uint32_r.csproj b/src/tests/JIT/Directed/shift/uint32_r.csproj index e5e6d972612791..e04ab62b5bc7bc 100644 --- a/src/tests/JIT/Directed/shift/uint32_r.csproj +++ b/src/tests/JIT/Directed/shift/uint32_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint32_ro.csproj b/src/tests/JIT/Directed/shift/uint32_ro.csproj index a9904ed3a2acbf..adbdf821b4e9b8 100644 --- a/src/tests/JIT/Directed/shift/uint32_ro.csproj +++ b/src/tests/JIT/Directed/shift/uint32_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint64.cs b/src/tests/JIT/Directed/shift/uint64.cs index 914a9a8c4dcc4e..abe5902ee13157 100644 --- a/src/tests/JIT/Directed/shift/uint64.cs +++ b/src/tests/JIT/Directed/shift/uint64.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; namespace ShiftTest { @@ -27,7 +28,8 @@ public static ulong f2(ulong arg_data) arg_data <<= 8; return arg_data; } - public static int Main() + [Fact] + public static int TestEntryPoint() { ulong loc_data = 0xFFFFFFFFFFFFFFFF; diff --git a/src/tests/JIT/Directed/shift/uint64Opt.cs b/src/tests/JIT/Directed/shift/uint64Opt.cs index 93fc49ceb08d14..c12b8bd37e3c8c 100644 --- a/src/tests/JIT/Directed/shift/uint64Opt.cs +++ b/src/tests/JIT/Directed/shift/uint64Opt.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; // Test long and ulong shifts by 0, 32 and 64 constants that can be optimized. namespace ShiftTest @@ -150,9 +151,10 @@ public static int run(long arg) } } - class Test + public class Test { - public static int Main() + [Fact] + public static int TestEntryPoint() { bool passed = true; ulong ulongArg = 0x3F134; diff --git a/src/tests/JIT/Directed/shift/uint64Opt_d.csproj b/src/tests/JIT/Directed/shift/uint64Opt_d.csproj index ee161b970bdd1b..c273325d5224d0 100644 --- a/src/tests/JIT/Directed/shift/uint64Opt_d.csproj +++ b/src/tests/JIT/Directed/shift/uint64Opt_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint64Opt_do.csproj b/src/tests/JIT/Directed/shift/uint64Opt_do.csproj index b1861d12a09411..bf90e75ab53f55 100644 --- a/src/tests/JIT/Directed/shift/uint64Opt_do.csproj +++ b/src/tests/JIT/Directed/shift/uint64Opt_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint64Opt_r.csproj b/src/tests/JIT/Directed/shift/uint64Opt_r.csproj index 795efed3792350..d89cc69d91bb65 100644 --- a/src/tests/JIT/Directed/shift/uint64Opt_r.csproj +++ b/src/tests/JIT/Directed/shift/uint64Opt_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint64Opt_ro.csproj b/src/tests/JIT/Directed/shift/uint64Opt_ro.csproj index 4185d84cc31e1e..4162727d91a911 100644 --- a/src/tests/JIT/Directed/shift/uint64Opt_ro.csproj +++ b/src/tests/JIT/Directed/shift/uint64Opt_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint64_d.csproj b/src/tests/JIT/Directed/shift/uint64_d.csproj index 1e203657ff99ae..aadba6cee47945 100644 --- a/src/tests/JIT/Directed/shift/uint64_d.csproj +++ b/src/tests/JIT/Directed/shift/uint64_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint64_do.csproj b/src/tests/JIT/Directed/shift/uint64_do.csproj index dc9e9e37be499a..54e88bb2588091 100644 --- a/src/tests/JIT/Directed/shift/uint64_do.csproj +++ b/src/tests/JIT/Directed/shift/uint64_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint64_r.csproj b/src/tests/JIT/Directed/shift/uint64_r.csproj index 72fce7931cb4ca..1234a12964f21a 100644 --- a/src/tests/JIT/Directed/shift/uint64_r.csproj +++ b/src/tests/JIT/Directed/shift/uint64_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint64_ro.csproj b/src/tests/JIT/Directed/shift/uint64_ro.csproj index d6580f188bbeac..0c831b4cc5a8cf 100644 --- a/src/tests/JIT/Directed/shift/uint64_ro.csproj +++ b/src/tests/JIT/Directed/shift/uint64_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint8.cs b/src/tests/JIT/Directed/shift/uint8.cs index 78f948cc56d7d0..05c9b10c06ef86 100644 --- a/src/tests/JIT/Directed/shift/uint8.cs +++ b/src/tests/JIT/Directed/shift/uint8.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; namespace ShiftTest { @@ -27,7 +28,8 @@ public static byte f2(byte arg_data) arg_data <<= 4; return arg_data; } - public static int Main() + [Fact] + public static int TestEntryPoint() { byte loc_data = 0xFF; diff --git a/src/tests/JIT/Directed/shift/uint8_cs_d.csproj b/src/tests/JIT/Directed/shift/uint8_cs_d.csproj index 25d775231e7f02..725054245a2486 100644 --- a/src/tests/JIT/Directed/shift/uint8_cs_d.csproj +++ b/src/tests/JIT/Directed/shift/uint8_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint8_cs_do.csproj b/src/tests/JIT/Directed/shift/uint8_cs_do.csproj index 69a77c7da36461..602ac9353a850b 100644 --- a/src/tests/JIT/Directed/shift/uint8_cs_do.csproj +++ b/src/tests/JIT/Directed/shift/uint8_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint8_cs_r.csproj b/src/tests/JIT/Directed/shift/uint8_cs_r.csproj index b66d0639bb5872..b3f15619ad9c93 100644 --- a/src/tests/JIT/Directed/shift/uint8_cs_r.csproj +++ b/src/tests/JIT/Directed/shift/uint8_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint8_cs_ro.csproj b/src/tests/JIT/Directed/shift/uint8_cs_ro.csproj index eb8aa33206075c..30435f9bce9f37 100644 --- a/src/tests/JIT/Directed/shift/uint8_cs_ro.csproj +++ b/src/tests/JIT/Directed/shift/uint8_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint8_d.csproj b/src/tests/JIT/Directed/shift/uint8_d.csproj deleted file mode 100644 index 34bf43869ce224..00000000000000 --- a/src/tests/JIT/Directed/shift/uint8_d.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - False - - - - - diff --git a/src/tests/JIT/Directed/shift/uint8_do.csproj b/src/tests/JIT/Directed/shift/uint8_do.csproj deleted file mode 100644 index ea6eff39f35121..00000000000000 --- a/src/tests/JIT/Directed/shift/uint8_do.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - Exe - 1 - - - full - True - - - - - diff --git a/src/tests/JIT/Directed/shift/uint8_r.csproj b/src/tests/JIT/Directed/shift/uint8_r.csproj index 12ffc702e652d1..31ce989e399326 100644 --- a/src/tests/JIT/Directed/shift/uint8_r.csproj +++ b/src/tests/JIT/Directed/shift/uint8_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/shift/uint8_ro.csproj b/src/tests/JIT/Directed/shift/uint8_ro.csproj index ebf27555a975d2..83b542b20d7522 100644 --- a/src/tests/JIT/Directed/shift/uint8_ro.csproj +++ b/src/tests/JIT/Directed/shift/uint8_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/tailcall/more_tailcalls.cs b/src/tests/JIT/Directed/tailcall/more_tailcalls.cs index b5f8e7aeb93917..0f5c6d1feb2226 100644 --- a/src/tests/JIT/Directed/tailcall/more_tailcalls.cs +++ b/src/tests/JIT/Directed/tailcall/more_tailcalls.cs @@ -10,6 +10,7 @@ using System.Diagnostics; using System.Reflection; using System.Runtime.CompilerServices; +using Xunit; struct S16 { @@ -48,7 +49,7 @@ class HeapInt public override string ToString() => $"{Value}"; } -internal class Program +public class Program { private static readonly IntPtr s_calcStaticCalli; private static readonly IntPtr s_calcStaticCalliOther; @@ -84,7 +85,8 @@ static Program() s_instanceMethodOnValueType = instanceMethodOnValueType; } - private static int Main() + [Fact] + public static int Main() { const int numCalcIters = 1000000; const int countUpIters = 1000000; diff --git a/src/tests/JIT/Directed/tailcall/more_tailcalls.il b/src/tests/JIT/Directed/tailcall/more_tailcalls.il index ef42d5fd330580..d5584433c20022 100644 --- a/src/tests/JIT/Directed/tailcall/more_tailcalls.il +++ b/src/tests/JIT/Directed/tailcall/more_tailcalls.il @@ -1,20 +1,16 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. +// Microsoft (R) .NET Framework IL Disassembler. Version 4.8.3928.0 +// Copyright (c) Microsoft Corporation. All rights reserved. // See more_tailcalls.cs for the source of this IL. // Metadata version: v4.0.30319 -.assembly extern System.Runtime -{ - .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 5:0:0:0 -} +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern xunit.core {} .assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 5:0:0:0 + .ver 7:0:0:0 } .assembly more_tailcalls { @@ -26,9 +22,9 @@ // .custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 ) .custom instance void [System.Runtime]System.Runtime.Versioning.TargetFrameworkAttribute::.ctor(string) = ( 01 00 18 2E 4E 45 54 43 6F 72 65 41 70 70 2C 56 // ....NETCoreApp,V - 65 72 73 69 6F 6E 3D 76 35 2E 30 01 00 54 0E 14 // ersion=v5.0..T.. + 65 72 73 69 6F 6E 3D 76 37 2E 30 01 00 54 0E 14 // ersion=v7.0..T.. 46 72 61 6D 65 77 6F 72 6B 44 69 73 70 6C 61 79 // FrameworkDisplay - 4E 61 6D 65 00 ) // Name. + 4E 61 6D 65 08 2E 4E 45 54 20 37 2E 30 ) // Name..NET 7.0 .custom instance void [System.Runtime]System.Reflection.AssemblyCompanyAttribute::.ctor(string) = ( 01 00 0E 6D 6F 72 65 5F 74 61 69 6C 63 61 6C 6C // ...more_tailcall 73 00 00 ) // s.. .custom instance void [System.Runtime]System.Reflection.AssemblyConfigurationAttribute::.ctor(string) = ( 01 00 07 52 65 6C 65 61 73 65 00 00 ) // ...Release.. @@ -39,43 +35,162 @@ .custom instance void [System.Runtime]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 0E 6D 6F 72 65 5F 74 61 69 6C 63 61 6C 6C // ...more_tailcall 73 00 00 ) // s.. .permissionset reqmin - = {class 'System.Security.Permissions.SecurityPermissionAttribute, System.Runtime, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' = {property bool 'SkipVerification' = bool(true)}} + = {class 'System.Security.Permissions.SecurityPermissionAttribute, System.Runtime, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' = {property bool 'SkipVerification' = bool(true)}} .hash algorithm 0x00008004 .ver 1:0:0:0 } -// MVID: {81332D24-430E-4E25-88E2-383124EB3597} +// MVID: {CAF8B990-D08A-4343-9074-7FE350EEBD80} .custom instance void [System.Runtime]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) +.custom instance void System.Runtime.CompilerServices.RefSafetyRulesAttribute::.ctor(int32) = ( 01 00 0B 00 00 00 00 00 ) .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x000001F273BC0000 +// Image base: 0x000002618BA40000 // =============== CLASS MEMBERS DECLARATION =================== +.class private auto ansi sealed beforefieldinit Microsoft.CodeAnalysis.EmbeddedAttribute + extends [System.Runtime]System.Attribute +{ + .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void Microsoft.CodeAnalysis.EmbeddedAttribute::.ctor() = ( 01 00 00 00 ) + .method public hidebysig specialname rtspecialname + instance void .ctor() cil managed + { + // Code size 7 (0x7) + .maxstack 8 + IL_0000: ldarg.0 + IL_0001: call instance void [System.Runtime]System.Attribute::.ctor() + IL_0006: ret + } // end of method EmbeddedAttribute::.ctor + +} // end of class Microsoft.CodeAnalysis.EmbeddedAttribute + +.class private auto ansi sealed beforefieldinit System.Runtime.CompilerServices.NullableAttribute + extends [System.Runtime]System.Attribute +{ + .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void Microsoft.CodeAnalysis.EmbeddedAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void [System.Runtime]System.AttributeUsageAttribute::.ctor(valuetype [System.Runtime]System.AttributeTargets) = ( 01 00 84 6B 00 00 02 00 54 02 0D 41 6C 6C 6F 77 // ...k....T..Allow + 4D 75 6C 74 69 70 6C 65 00 54 02 09 49 6E 68 65 // Multiple.T..Inhe + 72 69 74 65 64 00 ) // rited. + .field public initonly uint8[] NullableFlags + .method public hidebysig specialname rtspecialname + instance void .ctor(uint8 A_1) cil managed + { + // Code size 23 (0x17) + .maxstack 8 + IL_0000: ldarg.0 + IL_0001: call instance void [System.Runtime]System.Attribute::.ctor() + IL_0006: ldarg.0 + IL_0007: ldc.i4.1 + IL_0008: newarr [System.Runtime]System.Byte + IL_000d: dup + IL_000e: ldc.i4.0 + IL_000f: ldarg.1 + IL_0010: stelem.i1 + IL_0011: stfld uint8[] System.Runtime.CompilerServices.NullableAttribute::NullableFlags + IL_0016: ret + } // end of method NullableAttribute::.ctor + + .method public hidebysig specialname rtspecialname + instance void .ctor(uint8[] A_1) cil managed + { + // Code size 14 (0xe) + .maxstack 8 + IL_0000: ldarg.0 + IL_0001: call instance void [System.Runtime]System.Attribute::.ctor() + IL_0006: ldarg.0 + IL_0007: ldarg.1 + IL_0008: stfld uint8[] System.Runtime.CompilerServices.NullableAttribute::NullableFlags + IL_000d: ret + } // end of method NullableAttribute::.ctor + +} // end of class System.Runtime.CompilerServices.NullableAttribute + +.class private auto ansi sealed beforefieldinit System.Runtime.CompilerServices.NullableContextAttribute + extends [System.Runtime]System.Attribute +{ + .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void Microsoft.CodeAnalysis.EmbeddedAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void [System.Runtime]System.AttributeUsageAttribute::.ctor(valuetype [System.Runtime]System.AttributeTargets) = ( 01 00 4C 14 00 00 02 00 54 02 0D 41 6C 6C 6F 77 // ..L.....T..Allow + 4D 75 6C 74 69 70 6C 65 00 54 02 09 49 6E 68 65 // Multiple.T..Inhe + 72 69 74 65 64 00 ) // rited. + .field public initonly uint8 Flag + .method public hidebysig specialname rtspecialname + instance void .ctor(uint8 A_1) cil managed + { + // Code size 14 (0xe) + .maxstack 8 + IL_0000: ldarg.0 + IL_0001: call instance void [System.Runtime]System.Attribute::.ctor() + IL_0006: ldarg.0 + IL_0007: ldarg.1 + IL_0008: stfld uint8 System.Runtime.CompilerServices.NullableContextAttribute::Flag + IL_000d: ret + } // end of method NullableContextAttribute::.ctor + +} // end of class System.Runtime.CompilerServices.NullableContextAttribute + +.class private auto ansi sealed beforefieldinit System.Runtime.CompilerServices.RefSafetyRulesAttribute + extends [System.Runtime]System.Attribute +{ + .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void Microsoft.CodeAnalysis.EmbeddedAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void [System.Runtime]System.AttributeUsageAttribute::.ctor(valuetype [System.Runtime]System.AttributeTargets) = ( 01 00 02 00 00 00 02 00 54 02 0D 41 6C 6C 6F 77 // ........T..Allow + 4D 75 6C 74 69 70 6C 65 00 54 02 09 49 6E 68 65 // Multiple.T..Inhe + 72 69 74 65 64 00 ) // rited. + .field public initonly int32 Version + .method public hidebysig specialname rtspecialname + instance void .ctor(int32 A_1) cil managed + { + // Code size 14 (0xe) + .maxstack 8 + IL_0000: ldarg.0 + IL_0001: call instance void [System.Runtime]System.Attribute::.ctor() + IL_0006: ldarg.0 + IL_0007: ldarg.1 + IL_0008: stfld int32 System.Runtime.CompilerServices.RefSafetyRulesAttribute::Version + IL_000d: ret + } // end of method RefSafetyRulesAttribute::.ctor + +} // end of class System.Runtime.CompilerServices.RefSafetyRulesAttribute + .class private sequential ansi sealed beforefieldinit S16 extends [System.Runtime]System.ValueType { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public int64 A .field public int64 B .method public hidebysig virtual instance string ToString() cil managed { - // Code size 33 (0x21) - .maxstack 8 - IL_0000: ldstr "{0}, {1}" - IL_0005: ldarg.0 - IL_0006: ldfld int64 S16::A - IL_000b: box [System.Runtime]System.Int64 - IL_0010: ldarg.0 - IL_0011: ldfld int64 S16::B - IL_0016: box [System.Runtime]System.Int64 - IL_001b: call string [System.Runtime]System.String::Format(string, - object, - object) - IL_0020: ret + // Code size 55 (0x37) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.2 + IL_0003: ldc.i4.2 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldarg.0 + IL_000c: ldfld int64 S16::A + IL_0011: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0016: ldloca.s V_0 + IL_0018: ldstr ", " + IL_001d: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0022: ldloca.s V_0 + IL_0024: ldarg.0 + IL_0025: ldfld int64 S16::B + IL_002a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_002f: ldloca.s V_0 + IL_0031: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_0036: ret } // end of method S16::ToString .method public hidebysig instance string @@ -99,38 +214,43 @@ .method public hidebysig virtual instance string ToString() cil managed { - // Code size 73 (0x49) - .maxstack 5 - IL_0000: ldstr "{0}, {1}, {2}, {3}" - IL_0005: ldc.i4.4 - IL_0006: newarr [System.Runtime]System.Object - IL_000b: dup - IL_000c: ldc.i4.0 - IL_000d: ldarg.0 - IL_000e: ldfld int64 S32::A - IL_0013: box [System.Runtime]System.Int64 - IL_0018: stelem.ref - IL_0019: dup - IL_001a: ldc.i4.1 - IL_001b: ldarg.0 - IL_001c: ldfld int64 S32::B - IL_0021: box [System.Runtime]System.Int64 - IL_0026: stelem.ref - IL_0027: dup - IL_0028: ldc.i4.2 - IL_0029: ldarg.0 - IL_002a: ldfld int64 S32::C - IL_002f: box [System.Runtime]System.Int64 - IL_0034: stelem.ref - IL_0035: dup - IL_0036: ldc.i4.3 - IL_0037: ldarg.0 - IL_0038: ldfld int64 S32::D - IL_003d: box [System.Runtime]System.Int64 - IL_0042: stelem.ref - IL_0043: call string [System.Runtime]System.String::Format(string, - object[]) - IL_0048: ret + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + // Code size 105 (0x69) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.6 + IL_0003: ldc.i4.4 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldarg.0 + IL_000c: ldfld int64 S32::A + IL_0011: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0016: ldloca.s V_0 + IL_0018: ldstr ", " + IL_001d: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0022: ldloca.s V_0 + IL_0024: ldarg.0 + IL_0025: ldfld int64 S32::B + IL_002a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_002f: ldloca.s V_0 + IL_0031: ldstr ", " + IL_0036: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_003b: ldloca.s V_0 + IL_003d: ldarg.0 + IL_003e: ldfld int64 S32::C + IL_0043: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0048: ldloca.s V_0 + IL_004a: ldstr ", " + IL_004f: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0054: ldloca.s V_0 + IL_0056: ldarg.0 + IL_0057: ldfld int64 S32::D + IL_005c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0061: ldloca.s V_0 + IL_0063: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_0068: ret } // end of method S32::ToString } // end of class S32 @@ -138,6 +258,8 @@ .class private sequential ansi sealed beforefieldinit SGC extends [System.Runtime]System.ValueType { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public object A .field public object B .field public string C @@ -145,34 +267,42 @@ .method public hidebysig virtual instance string ToString() cil managed { - // Code size 53 (0x35) - .maxstack 8 - IL_0000: ldstr "{0}, {1}, {2}, {3}" - IL_0005: ldc.i4.4 - IL_0006: newarr [System.Runtime]System.Object - IL_000b: dup - IL_000c: ldc.i4.0 - IL_000d: ldarg.0 - IL_000e: ldfld object SGC::A - IL_0013: stelem.ref - IL_0014: dup - IL_0015: ldc.i4.1 - IL_0016: ldarg.0 - IL_0017: ldfld object SGC::B - IL_001c: stelem.ref - IL_001d: dup - IL_001e: ldc.i4.2 - IL_001f: ldarg.0 - IL_0020: ldfld string SGC::C - IL_0025: stelem.ref - IL_0026: dup - IL_0027: ldc.i4.3 - IL_0028: ldarg.0 - IL_0029: ldfld string SGC::D - IL_002e: stelem.ref - IL_002f: call string [System.Runtime]System.String::Format(string, - object[]) - IL_0034: ret + // Code size 105 (0x69) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.6 + IL_0003: ldc.i4.4 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldarg.0 + IL_000c: ldfld object SGC::A + IL_0011: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0016: ldloca.s V_0 + IL_0018: ldstr ", " + IL_001d: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0022: ldloca.s V_0 + IL_0024: ldarg.0 + IL_0025: ldfld object SGC::B + IL_002a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_002f: ldloca.s V_0 + IL_0031: ldstr ", " + IL_0036: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_003b: ldloca.s V_0 + IL_003d: ldarg.0 + IL_003e: ldfld string SGC::C + IL_0043: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0048: ldloca.s V_0 + IL_004a: ldstr ", " + IL_004f: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0054: ldloca.s V_0 + IL_0056: ldarg.0 + IL_0057: ldfld string SGC::D + IL_005c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0061: ldloca.s V_0 + IL_0063: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_0068: ret } // end of method SGC::ToString } // end of class SGC @@ -180,6 +310,8 @@ .class private sequential ansi sealed beforefieldinit SGC2 extends [System.Runtime]System.ValueType { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public int32 A .field public valuetype SGC B .field public object C @@ -187,37 +319,42 @@ .method public hidebysig virtual instance string ToString() cil managed { - // Code size 68 (0x44) - .maxstack 5 - IL_0000: ldstr "{0}, ({1}), {2}, {3}" - IL_0005: ldc.i4.4 - IL_0006: newarr [System.Runtime]System.Object - IL_000b: dup - IL_000c: ldc.i4.0 - IL_000d: ldarg.0 - IL_000e: ldfld int32 SGC2::A - IL_0013: box [System.Runtime]System.Int32 - IL_0018: stelem.ref - IL_0019: dup - IL_001a: ldc.i4.1 - IL_001b: ldarg.0 - IL_001c: ldfld valuetype SGC SGC2::B - IL_0021: box SGC - IL_0026: stelem.ref - IL_0027: dup - IL_0028: ldc.i4.2 - IL_0029: ldarg.0 - IL_002a: ldfld object SGC2::C - IL_002f: stelem.ref - IL_0030: dup - IL_0031: ldc.i4.3 - IL_0032: ldarg.0 - IL_0033: ldfld int32 SGC2::D - IL_0038: box [System.Runtime]System.Int32 - IL_003d: stelem.ref - IL_003e: call string [System.Runtime]System.String::Format(string, - object[]) - IL_0043: ret + // Code size 105 (0x69) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.8 + IL_0003: ldc.i4.4 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldarg.0 + IL_000c: ldfld int32 SGC2::A + IL_0011: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0016: ldloca.s V_0 + IL_0018: ldstr ", (" + IL_001d: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0022: ldloca.s V_0 + IL_0024: ldarg.0 + IL_0025: ldfld valuetype SGC SGC2::B + IL_002a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_002f: ldloca.s V_0 + IL_0031: ldstr "), " + IL_0036: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_003b: ldloca.s V_0 + IL_003d: ldarg.0 + IL_003e: ldfld object SGC2::C + IL_0043: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0048: ldloca.s V_0 + IL_004a: ldstr ", " + IL_004f: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0054: ldloca.s V_0 + IL_0056: ldarg.0 + IL_0057: ldfld int32 SGC2::D + IL_005c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0061: ldloca.s V_0 + IL_0063: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_0068: ret } // end of method SGC2::ToString } // end of class SGC2 @@ -242,25 +379,37 @@ .method public hidebysig virtual instance string ToString() cil managed { - // Code size 22 (0x16) - .maxstack 8 - IL_0000: ldstr "{0}" - IL_0005: ldarg.0 - IL_0006: ldfld int32 HeapInt::Value - IL_000b: box [System.Runtime]System.Int32 - IL_0010: call string [System.Runtime]System.String::Format(string, - object) - IL_0015: ret + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + // Code size 30 (0x1e) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.0 + IL_0003: ldc.i4.1 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldarg.0 + IL_000c: ldfld int32 HeapInt::Value + IL_0011: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0016: ldloca.s V_0 + IL_0018: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_001d: ret } // end of method HeapInt::ToString } // end of class HeapInt -.class private auto ansi Program +.class public auto ansi Program extends [System.Runtime]System.Object { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .class auto ansi nested private beforefieldinit GenericInstance`1 extends [System.Runtime]System.Object { + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .param type T + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) .field private class Program/GenericInstanceFactory factory .method public hidebysig specialname rtspecialname instance void .ctor(class Program/GenericInstanceFactory factory) cil managed @@ -291,10 +440,12 @@ .class auto ansi nested private beforefieldinit GenericInstanceFactory extends [System.Runtime]System.Object { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public int32 counter .method public hidebysig instance class Program/GenericInstance`1 CreateInstance() cil managed noinlining { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) // Code size 21 (0x15) .maxstack 8 IL_0000: ldarg.0 @@ -327,11 +478,17 @@ .field public bool result .field public int32 ten .field public class GenInstance`2 g + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8[]) = ( 01 00 02 00 00 00 00 01 00 00 ) .field public class IGenInterface`2 ig + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8[]) = ( 01 00 02 00 00 00 00 01 00 00 ) .field public class IGenInterface`2 ig2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8[]) = ( 01 00 03 00 00 00 00 01 01 00 00 ) .field public class GenAbstractImpl`1 ga1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8[]) = ( 01 00 02 00 00 00 00 01 00 00 ) .field public class GenAbstractImpl`1 ga2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public int32[] a + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { @@ -347,6 +504,11 @@ !!T expected, string name) cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .param [1] + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8[]) = ( 01 00 02 00 00 00 01 00 00 00 ) + .param [3] + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) // Code size 105 (0x69) .maxstack 4 .locals init (class [System.Runtime]System.Diagnostics.Stopwatch V_0, @@ -400,6 +562,11 @@ !!T expected, string name) cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .param [1] + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8[]) = ( 01 00 02 00 00 00 01 00 00 00 ) + .param [3] + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) // Code size 34 (0x22) .maxstack 4 .locals init (class Program/'<>c__DisplayClass7_1`1' V_0) @@ -424,6 +591,7 @@ .method assembly hidebysig instance string '
b__7'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 51 (0x33) .maxstack 10 IL_0000: newobj instance void Instance::.ctor() @@ -453,6 +621,7 @@ .method assembly hidebysig instance string '
b__19'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 28 (0x1c) .maxstack 8 IL_0000: ldarg.0 @@ -471,6 +640,7 @@ .method assembly hidebysig instance string '
b__20'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 28 (0x1c) .maxstack 8 IL_0000: ldarg.0 @@ -489,6 +659,7 @@ .method assembly hidebysig instance string '
b__21'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 28 (0x1c) .maxstack 8 IL_0000: ldstr "a" @@ -508,6 +679,7 @@ .method assembly hidebysig instance string '
b__22'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 18 (0x12) .maxstack 8 IL_0000: ldstr "a" @@ -523,6 +695,7 @@ .method assembly hidebysig instance string '
b__23'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 28 (0x1c) .maxstack 8 IL_0000: ldstr "a" @@ -542,6 +715,7 @@ .method assembly hidebysig instance string '
b__24'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 22 (0x16) .maxstack 8 IL_0000: ldstr "a" @@ -557,6 +731,7 @@ .method assembly hidebysig instance string '
b__25'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 12 (0xc) .maxstack 8 IL_0000: ldarg.0 @@ -568,6 +743,7 @@ .method assembly hidebysig instance string '
b__26'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 12 (0xc) .maxstack 8 IL_0000: ldarg.0 @@ -579,6 +755,7 @@ .method assembly hidebysig instance string '
b__27'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 12 (0xc) .maxstack 8 IL_0000: ldarg.0 @@ -590,6 +767,7 @@ .method assembly hidebysig instance string '
b__28'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 12 (0xc) .maxstack 8 IL_0000: ldarg.0 @@ -623,6 +801,7 @@ { .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) .field public class [System.Runtime]System.Func`3 f + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { @@ -636,6 +815,7 @@ .method assembly hidebysig instance !T '
b__31'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 18 (0x12) .maxstack 8 IL_0000: ldarg.0 @@ -649,28 +829,66 @@ } // end of class '<>c__DisplayClass7_1`1' + .class abstract auto ansi sealed nested private beforefieldinit '<>O' + extends [System.Runtime]System.Object + { + .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) + .field public static class [System.Runtime]System.Func`3 '<0>__CalcStatic' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .field public static class [System.Runtime]System.Func`3 '<1>__CalcStaticSmall' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .field public static class [System.Runtime]System.Func`3 '<2>__CalcStaticRetbuf' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .field public static class [System.Runtime]System.Func`3 '<3>__CalcStaticLong' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .field public static class [System.Runtime]System.Func`3 '<4>__CalcStaticS16' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .field public static class [System.Runtime]System.Func`3 '<5>__CalcStaticCalli' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .field public static class [System.Runtime]System.Func`3 '<6>__CalcStaticCalliRetbuf' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + } // end of class '<>O' + .class auto ansi serializable sealed nested private beforefieldinit '<>c' extends [System.Runtime]System.Object { .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) .field public static initonly class Program/'<>c' '<>9' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`3 '<>9__7_2' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_3' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_4' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_5' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_6' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_8' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_9' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_10' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_11' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_12' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_13' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_14' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_15' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_16' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_17' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_18' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field public static class [System.Runtime]System.Func`1 '<>9__7_30' + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .method private hidebysig specialname rtspecialname static void .cctor() cil managed { @@ -708,6 +926,7 @@ .method assembly hidebysig instance string '
b__7_3'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 6 (0x6) .maxstack 8 IL_0000: call string Program::EmptyCalli() @@ -717,6 +936,7 @@ .method assembly hidebysig instance string '
b__7_4'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 6 (0x6) .maxstack 8 IL_0000: call string Program::ValueTypeInstanceMethodCalli() @@ -726,6 +946,7 @@ .method assembly hidebysig instance string '
b__7_5'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 6 (0x6) .maxstack 8 IL_0000: call string Program::ValueTypeExplicitThisInstanceMethodCalli() @@ -785,6 +1006,7 @@ .method assembly hidebysig instance string '
b__7_10'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 11 (0xb) .maxstack 8 IL_0000: ldstr "hello" @@ -795,6 +1017,7 @@ .method assembly hidebysig instance string '
b__7_11'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 11 (0xb) .maxstack 8 IL_0000: ldstr "hello" @@ -805,6 +1028,7 @@ .method assembly hidebysig instance string '
b__7_12'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 7 (0x7) .maxstack 8 IL_0000: ldc.i4.5 @@ -815,6 +1039,7 @@ .method assembly hidebysig instance string '
b__7_13'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 16 (0x10) .maxstack 8 IL_0000: ldstr "hello" @@ -827,6 +1052,7 @@ .method assembly hidebysig instance string '
b__7_14'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 12 (0xc) .maxstack 8 IL_0000: ldstr "hello" @@ -839,6 +1065,7 @@ .method assembly hidebysig instance string '
b__7_15'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 16 (0x10) .maxstack 8 IL_0000: ldstr "hello" @@ -851,6 +1078,7 @@ .method assembly hidebysig instance string '
b__7_16'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 16 (0x10) .maxstack 8 IL_0000: ldstr "hello" @@ -863,6 +1091,7 @@ .method assembly hidebysig instance string '
b__7_17'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 12 (0xc) .maxstack 8 IL_0000: ldc.i4.5 @@ -875,6 +1104,7 @@ .method assembly hidebysig instance string '
b__7_18'() cil managed { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 16 (0x10) .maxstack 8 IL_0000: ldstr "hello" @@ -946,14 +1176,13 @@ IL_0052: ret } // end of method Program::.cctor - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( - 01 00 00 00 - ) + 01 00 00 00 + ) .entrypoint - // Code size 1835 (0x72b) + // Code size 1940 (0x794) .maxstack 4 .locals init (class Program/'<>c__DisplayClass7_0' V_0, int32 V_1, @@ -1064,623 +1293,672 @@ IL_00ea: ldc.i4.s 10 IL_00ec: stfld int32 Program/'<>c__DisplayClass7_0'::ten IL_00f1: ldloc.0 - IL_00f2: ldnull - IL_00f3: ldftn int32 Program::CalcStatic(int32, + IL_00f2: ldsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<0>__CalcStatic' + IL_00f7: dup + IL_00f8: brtrue.s IL_010d + + IL_00fa: pop + IL_00fb: ldnull + IL_00fc: ldftn int32 Program::CalcStatic(int32, int32) - IL_00f9: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_0102: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_00fe: ldloc.3 - IL_00ff: ldstr "Static non-generic" - IL_0104: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_0107: dup + IL_0108: stsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<0>__CalcStatic' + IL_010d: ldloc.3 + IL_010e: ldstr "Static non-generic" + IL_0113: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_0109: ldloc.0 - IL_010a: ldnull - IL_010b: ldftn uint8 Program::CalcStaticSmall(int32, + IL_0118: ldloc.0 + IL_0119: ldsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<1>__CalcStaticSmall' + IL_011e: dup + IL_011f: brtrue.s IL_0134 + + IL_0121: pop + IL_0122: ldnull + IL_0123: ldftn uint8 Program::CalcStaticSmall(int32, int32) - IL_0111: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_0129: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_0116: ldloc.3 - IL_0117: conv.u1 - IL_0118: ldstr "Static non-generic small" - IL_011d: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_012e: dup + IL_012f: stsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<1>__CalcStaticSmall' + IL_0134: ldloc.3 + IL_0135: conv.u1 + IL_0136: ldstr "Static non-generic small" + IL_013b: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_0122: ldloc.0 - IL_0123: ldnull - IL_0124: ldftn valuetype S32 Program::CalcStaticRetbuf(int32, + IL_0140: ldloc.0 + IL_0141: ldsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<2>__CalcStaticRetbuf' + IL_0146: dup + IL_0147: brtrue.s IL_015c + + IL_0149: pop + IL_014a: ldnull + IL_014b: ldftn valuetype S32 Program::CalcStaticRetbuf(int32, int32) - IL_012a: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_0151: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_012f: ldloc.s V_8 - IL_0131: ldstr "Static non-generic retbuf" - IL_0136: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_0156: dup + IL_0157: stsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<2>__CalcStaticRetbuf' + IL_015c: ldloc.s V_8 + IL_015e: ldstr "Static non-generic retbuf" + IL_0163: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_013b: ldloc.0 - IL_013c: ldnull - IL_013d: ldftn int64 Program::CalcStaticLong(int32, + IL_0168: ldloc.0 + IL_0169: ldsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<3>__CalcStaticLong' + IL_016e: dup + IL_016f: brtrue.s IL_0184 + + IL_0171: pop + IL_0172: ldnull + IL_0173: ldftn int64 Program::CalcStaticLong(int32, int32) - IL_0143: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_0179: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_0148: ldloc.s V_6 - IL_014a: ldstr "Static non-generic long" - IL_014f: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_017e: dup + IL_017f: stsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<3>__CalcStaticLong' + IL_0184: ldloc.s V_6 + IL_0186: ldstr "Static non-generic long" + IL_018b: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_0154: ldloc.0 - IL_0155: ldnull - IL_0156: ldftn valuetype S16 Program::CalcStaticS16(int32, + IL_0190: ldloc.0 + IL_0191: ldsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<4>__CalcStaticS16' + IL_0196: dup + IL_0197: brtrue.s IL_01ac + + IL_0199: pop + IL_019a: ldnull + IL_019b: ldftn valuetype S16 Program::CalcStaticS16(int32, int32) - IL_015c: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_01a1: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_0161: ldloc.s V_7 - IL_0163: ldstr "Static non-generic S16" - IL_0168: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_01a6: dup + IL_01a7: stsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<4>__CalcStaticS16' + IL_01ac: ldloc.s V_7 + IL_01ae: ldstr "Static non-generic S16" + IL_01b3: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_016d: ldloc.0 - IL_016e: ldsfld class [System.Runtime]System.Func`3 Program/'<>c'::'<>9__7_2' - IL_0173: dup - IL_0174: brtrue.s IL_018d - - IL_0176: pop - IL_0177: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_017c: ldftn instance int32 Program/'<>c'::'
b__7_2'(int32, + IL_01b8: ldloc.0 + IL_01b9: ldsfld class [System.Runtime]System.Func`3 Program/'<>c'::'<>9__7_2' + IL_01be: dup + IL_01bf: brtrue.s IL_01d8 + + IL_01c1: pop + IL_01c2: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_01c7: ldftn instance int32 Program/'<>c'::'
b__7_2'(int32, int32) - IL_0182: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_01cd: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_0187: dup - IL_0188: stsfld class [System.Runtime]System.Func`3 Program/'<>c'::'<>9__7_2' - IL_018d: ldloc.3 - IL_018e: ldstr "Static void" - IL_0193: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_01d2: dup + IL_01d3: stsfld class [System.Runtime]System.Func`3 Program/'<>c'::'<>9__7_2' + IL_01d8: ldloc.3 + IL_01d9: ldstr "Static void" + IL_01de: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_0198: ldloc.0 - IL_0199: newobj instance void Instance::.ctor() - IL_019e: ldftn instance int32 Instance::CalcInstance(int32, + IL_01e3: ldloc.0 + IL_01e4: newobj instance void Instance::.ctor() + IL_01e9: ldftn instance int32 Instance::CalcInstance(int32, int32) - IL_01a4: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_01ef: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_01a9: ldloc.3 - IL_01aa: ldstr "Instance non-generic" - IL_01af: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_01f4: ldloc.3 + IL_01f5: ldstr "Instance non-generic" + IL_01fa: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_01b4: ldloc.0 - IL_01b5: newobj instance void Instance::.ctor() - IL_01ba: ldftn instance valuetype S32 Instance::CalcInstanceRetbuf(int32, + IL_01ff: ldloc.0 + IL_0200: newobj instance void Instance::.ctor() + IL_0205: ldftn instance valuetype S32 Instance::CalcInstanceRetbuf(int32, int32) - IL_01c0: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_020b: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_01c5: ldloc.s V_8 - IL_01c7: ldstr "Instance non-generic retbuf" - IL_01cc: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_0210: ldloc.s V_8 + IL_0212: ldstr "Instance non-generic retbuf" + IL_0217: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_01d1: ldloc.0 - IL_01d2: ldloc.s V_4 - IL_01d4: dup - IL_01d5: ldvirtftn instance int32 BaseClass::CalcAbstract(int32, + IL_021c: ldloc.0 + IL_021d: ldloc.s V_4 + IL_021f: dup + IL_0220: ldvirtftn instance int32 BaseClass::CalcAbstract(int32, int32) - IL_01db: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_0226: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_01e0: ldloc.3 - IL_01e1: ldstr "Abstract class non-generic" - IL_01e6: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_022b: ldloc.3 + IL_022c: ldstr "Abstract class non-generic" + IL_0231: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_01eb: ldloc.0 - IL_01ec: ldloc.s V_4 - IL_01ee: dup - IL_01ef: ldvirtftn instance valuetype S32 BaseClass::CalcAbstractRetbuf(int32, + IL_0236: ldloc.0 + IL_0237: ldloc.s V_4 + IL_0239: dup + IL_023a: ldvirtftn instance valuetype S32 BaseClass::CalcAbstractRetbuf(int32, int32) - IL_01f5: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_0240: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_01fa: ldloc.s V_8 - IL_01fc: ldstr "Abstract class non-generic retbuf" - IL_0201: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_0245: ldloc.s V_8 + IL_0247: ldstr "Abstract class non-generic retbuf" + IL_024c: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_0206: ldloc.0 - IL_0207: ldloc.s V_5 - IL_0209: dup - IL_020a: ldvirtftn instance int32 InterfaceImpl::CalcInterface(int32, + IL_0251: ldloc.0 + IL_0252: ldloc.s V_5 + IL_0254: dup + IL_0255: ldvirtftn instance int32 InterfaceImpl::CalcInterface(int32, int32) - IL_0210: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_025b: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_0215: ldloc.3 - IL_0216: ldstr "Interface non-generic" - IL_021b: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_0260: ldloc.3 + IL_0261: ldstr "Interface non-generic" + IL_0266: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_0220: ldloc.0 - IL_0221: ldloc.s V_5 - IL_0223: dup - IL_0224: ldvirtftn instance valuetype S32 InterfaceImpl::CalcInterfaceRetbuf(int32, + IL_026b: ldloc.0 + IL_026c: ldloc.s V_5 + IL_026e: dup + IL_026f: ldvirtftn instance valuetype S32 InterfaceImpl::CalcInterfaceRetbuf(int32, int32) - IL_022a: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_0275: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_022f: ldloc.s V_8 - IL_0231: ldstr "Interface non-generic retbuf" - IL_0236: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_027a: ldloc.s V_8 + IL_027c: ldstr "Interface non-generic retbuf" + IL_0281: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_023b: ldloc.0 - IL_023c: ldnull - IL_023d: ldftn int32 Program::CalcStaticCalli(int32, + IL_0286: ldloc.0 + IL_0287: ldsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<5>__CalcStaticCalli' + IL_028c: dup + IL_028d: brtrue.s IL_02a2 + + IL_028f: pop + IL_0290: ldnull + IL_0291: ldftn int32 Program::CalcStaticCalli(int32, int32) - IL_0243: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_0297: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_0248: ldloc.3 - IL_0249: ldstr "Static calli" - IL_024e: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_029c: dup + IL_029d: stsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<5>__CalcStaticCalli' + IL_02a2: ldloc.3 + IL_02a3: ldstr "Static calli" + IL_02a8: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_0253: ldloc.0 - IL_0254: ldnull - IL_0255: ldftn valuetype S32 Program::CalcStaticCalliRetbuf(int32, + IL_02ad: ldloc.0 + IL_02ae: ldsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<6>__CalcStaticCalliRetbuf' + IL_02b3: dup + IL_02b4: brtrue.s IL_02c9 + + IL_02b6: pop + IL_02b7: ldnull + IL_02b8: ldftn valuetype S32 Program::CalcStaticCalliRetbuf(int32, int32) - IL_025b: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_02be: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_0260: ldloc.s V_8 - IL_0262: ldstr "Static calli retbuf" - IL_0267: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_02c3: dup + IL_02c4: stsfld class [System.Runtime]System.Func`3 Program/'<>O'::'<6>__CalcStaticCalliRetbuf' + IL_02c9: ldloc.s V_8 + IL_02cb: ldstr "Static calli retbuf" + IL_02d0: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_026c: ldloc.0 - IL_026d: newobj instance void Instance::.ctor() - IL_0272: ldftn instance int32 Instance::CalcInstanceCalli(int32, + IL_02d5: ldloc.0 + IL_02d6: newobj instance void Instance::.ctor() + IL_02db: ldftn instance int32 Instance::CalcInstanceCalli(int32, int32) - IL_0278: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_02e1: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_027d: ldloc.3 - IL_027e: ldstr "Instance calli" - IL_0283: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_02e6: ldloc.3 + IL_02e7: ldstr "Instance calli" + IL_02ec: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_0288: ldloc.0 - IL_0289: newobj instance void Instance::.ctor() - IL_028e: ldftn instance valuetype S32 Instance::CalcInstanceCalliRetbuf(int32, + IL_02f1: ldloc.0 + IL_02f2: newobj instance void Instance::.ctor() + IL_02f7: ldftn instance valuetype S32 Instance::CalcInstanceCalliRetbuf(int32, int32) - IL_0294: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, + IL_02fd: newobj instance void class [System.Runtime]System.Func`3::.ctor(object, native int) - IL_0299: ldloc.s V_8 - IL_029b: ldstr "Instance calli retbuf" - IL_02a0: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, + IL_0302: ldloc.s V_8 + IL_0304: ldstr "Instance calli retbuf" + IL_0309: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__TestCalc|1'(class [System.Runtime]System.Func`3, !!0, string) - IL_02a5: ldloc.0 - IL_02a6: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_3' - IL_02ab: dup - IL_02ac: brtrue.s IL_02c5 - - IL_02ae: pop - IL_02af: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_02b4: ldftn instance string Program/'<>c'::'
b__7_3'() - IL_02ba: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_030e: ldloc.0 + IL_030f: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_3' + IL_0314: dup + IL_0315: brtrue.s IL_032e + + IL_0317: pop + IL_0318: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_031d: ldftn instance string Program/'<>c'::'
b__7_3'() + IL_0323: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_02bf: dup - IL_02c0: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_3' - IL_02c5: ldstr "Empty calli" - IL_02ca: ldstr "Static calli without args" - IL_02cf: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0328: dup + IL_0329: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_3' + IL_032e: ldstr "Empty calli" + IL_0333: ldstr "Static calli without args" + IL_0338: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_02d4: ldloc.0 - IL_02d5: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_4' - IL_02da: dup - IL_02db: brtrue.s IL_02f4 - - IL_02dd: pop - IL_02de: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_02e3: ldftn instance string Program/'<>c'::'
b__7_4'() - IL_02e9: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_033d: ldloc.0 + IL_033e: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_4' + IL_0343: dup + IL_0344: brtrue.s IL_035d + + IL_0346: pop + IL_0347: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_034c: ldftn instance string Program/'<>c'::'
b__7_4'() + IL_0352: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_02ee: dup - IL_02ef: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_4' - IL_02f4: ldstr "Instance method" - IL_02f9: ldstr "calli to an instance method on a value type" - IL_02fe: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0357: dup + IL_0358: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_4' + IL_035d: ldstr "Instance method" + IL_0362: ldstr "calli to an instance method on a value type" + IL_0367: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0303: ldloc.0 - IL_0304: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_5' - IL_0309: dup - IL_030a: brtrue.s IL_0323 - - IL_030c: pop - IL_030d: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_0312: ldftn instance string Program/'<>c'::'
b__7_5'() - IL_0318: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_036c: ldloc.0 + IL_036d: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_5' + IL_0372: dup + IL_0373: brtrue.s IL_038c + + IL_0375: pop + IL_0376: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_037b: ldftn instance string Program/'<>c'::'
b__7_5'() + IL_0381: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_031d: dup - IL_031e: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_5' - IL_0323: ldstr "Instance method" - IL_0328: ldstr "calli to an instance method on a value type with e" + IL_0386: dup + IL_0387: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_5' + IL_038c: ldstr "Instance method" + IL_0391: ldstr "calli to an instance method on a value type with e" + "xplicit this" - IL_032d: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0396: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0332: ldloc.0 - IL_0333: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_6' - IL_0338: dup - IL_0339: brtrue.s IL_0352 - - IL_033b: pop - IL_033c: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_0341: ldftn instance int32 Program/'<>c'::'
b__7_6'() - IL_0347: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_039b: ldloc.0 + IL_039c: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_6' + IL_03a1: dup + IL_03a2: brtrue.s IL_03bb + + IL_03a4: pop + IL_03a5: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_03aa: ldftn instance int32 Program/'<>c'::'
b__7_6'() + IL_03b0: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_034c: dup - IL_034d: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_6' - IL_0352: ldc.i4 0xf4240 - IL_0357: ldstr "Value type instance call" - IL_035c: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_03b5: dup + IL_03b6: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_6' + IL_03bb: ldc.i4 0xf4240 + IL_03c0: ldstr "Value type instance call" + IL_03c5: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0361: ldloc.0 - IL_0362: ldloc.0 - IL_0363: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__7'() - IL_0369: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_03ca: ldloc.0 + IL_03cb: ldloc.0 + IL_03cc: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__7'() + IL_03d2: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_036e: ldstr "2 3 4 5 6 7 8 9 10" - IL_0373: ldstr "Instance with GC" - IL_0378: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_03d7: ldstr "2 3 4 5 6 7 8 9 10" + IL_03dc: ldstr "Instance with GC" + IL_03e1: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_037d: ldloc.0 - IL_037e: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_8' - IL_0383: dup - IL_0384: brtrue.s IL_039d - - IL_0386: pop - IL_0387: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_038c: ldftn instance int32 Program/'<>c'::'
b__7_8'() - IL_0392: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_03e6: ldloc.0 + IL_03e7: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_8' + IL_03ec: dup + IL_03ed: brtrue.s IL_0406 + + IL_03ef: pop + IL_03f0: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_03f5: ldftn instance int32 Program/'<>c'::'
b__7_8'() + IL_03fb: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_0397: dup - IL_0398: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_8' - IL_039d: ldc.i4 0xf4240 - IL_03a2: ldstr "Count up with heap int" - IL_03a7: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0400: dup + IL_0401: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_8' + IL_0406: ldc.i4 0xf4240 + IL_040b: ldstr "Count up with heap int" + IL_0410: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_03ac: ldloc.0 - IL_03ad: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_9' - IL_03b2: dup - IL_03b3: brtrue.s IL_03cc - - IL_03b5: pop - IL_03b6: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_03bb: ldftn instance int32 Program/'<>c'::'
b__7_9'() - IL_03c1: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0415: ldloc.0 + IL_0416: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_9' + IL_041b: dup + IL_041c: brtrue.s IL_0435 + + IL_041e: pop + IL_041f: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_0424: ldftn instance int32 Program/'<>c'::'
b__7_9'() + IL_042a: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_03c6: dup - IL_03c7: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_9' - IL_03cc: ldc.i4 0xf4240 - IL_03d1: ldstr "Count up with byref to heap" - IL_03d6: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_042f: dup + IL_0430: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_9' + IL_0435: ldc.i4 0xf4240 + IL_043a: ldstr "Count up with byref to heap" + IL_043f: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_03db: ldloc.0 - IL_03dc: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_10' - IL_03e1: dup - IL_03e2: brtrue.s IL_03fb - - IL_03e4: pop - IL_03e5: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_03ea: ldftn instance string Program/'<>c'::'
b__7_10'() - IL_03f0: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0444: ldloc.0 + IL_0445: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_10' + IL_044a: dup + IL_044b: brtrue.s IL_0464 + + IL_044d: pop + IL_044e: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_0453: ldftn instance string Program/'<>c'::'
b__7_10'() + IL_0459: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_03f5: dup - IL_03f6: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_10' - IL_03fb: ldstr "System.String hello" - IL_0400: ldstr "Static generic string" - IL_0405: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_045e: dup + IL_045f: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_10' + IL_0464: ldstr "System.String hello" + IL_0469: ldstr "Static generic string" + IL_046e: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_040a: ldloc.0 - IL_040b: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_11' - IL_0410: dup - IL_0411: brtrue.s IL_042a - - IL_0413: pop - IL_0414: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_0419: ldftn instance string Program/'<>c'::'
b__7_11'() - IL_041f: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0473: ldloc.0 + IL_0474: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_11' + IL_0479: dup + IL_047a: brtrue.s IL_0493 + + IL_047c: pop + IL_047d: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_0482: ldftn instance string Program/'<>c'::'
b__7_11'() + IL_0488: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_0424: dup - IL_0425: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_11' - IL_042a: ldstr "System.Object hello" - IL_042f: ldstr "Static generic object" - IL_0434: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_048d: dup + IL_048e: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_11' + IL_0493: ldstr "System.Object hello" + IL_0498: ldstr "Static generic object" + IL_049d: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0439: ldloc.0 - IL_043a: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_12' - IL_043f: dup - IL_0440: brtrue.s IL_0459 - - IL_0442: pop - IL_0443: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_0448: ldftn instance string Program/'<>c'::'
b__7_12'() - IL_044e: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_04a2: ldloc.0 + IL_04a3: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_12' + IL_04a8: dup + IL_04a9: brtrue.s IL_04c2 + + IL_04ab: pop + IL_04ac: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_04b1: ldftn instance string Program/'<>c'::'
b__7_12'() + IL_04b7: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_0453: dup - IL_0454: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_12' - IL_0459: ldstr "System.Int32 5" - IL_045e: ldstr "Static generic int" - IL_0463: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_04bc: dup + IL_04bd: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_12' + IL_04c2: ldstr "System.Int32 5" + IL_04c7: ldstr "Static generic int" + IL_04cc: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0468: ldloc.0 - IL_0469: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_13' - IL_046e: dup - IL_046f: brtrue.s IL_0488 - - IL_0471: pop - IL_0472: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_0477: ldftn instance string Program/'<>c'::'
b__7_13'() - IL_047d: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_04d1: ldloc.0 + IL_04d2: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_13' + IL_04d7: dup + IL_04d8: brtrue.s IL_04f1 + + IL_04da: pop + IL_04db: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_04e0: ldftn instance string Program/'<>c'::'
b__7_13'() + IL_04e6: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_0482: dup - IL_0483: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_13' - IL_0488: ldstr "System.String System.Object hello hello2" - IL_048d: ldstr "Static generic 2 string object" - IL_0492: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_04eb: dup + IL_04ec: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_13' + IL_04f1: ldstr "System.String System.Object hello hello2" + IL_04f6: ldstr "Static generic 2 string object" + IL_04fb: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0497: ldloc.0 - IL_0498: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_14' - IL_049d: dup - IL_049e: brtrue.s IL_04b7 - - IL_04a0: pop - IL_04a1: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_04a6: ldftn instance string Program/'<>c'::'
b__7_14'() - IL_04ac: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0500: ldloc.0 + IL_0501: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_14' + IL_0506: dup + IL_0507: brtrue.s IL_0520 + + IL_0509: pop + IL_050a: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_050f: ldftn instance string Program/'<>c'::'
b__7_14'() + IL_0515: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_04b1: dup - IL_04b2: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_14' - IL_04b7: ldstr "System.String System.Int32 hello 5" - IL_04bc: ldstr "Static generic 2 string int" - IL_04c1: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_051a: dup + IL_051b: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_14' + IL_0520: ldstr "System.String System.Int32 hello 5" + IL_0525: ldstr "Static generic 2 string int" + IL_052a: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_04c6: ldloc.0 - IL_04c7: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_15' - IL_04cc: dup - IL_04cd: brtrue.s IL_04e6 - - IL_04cf: pop - IL_04d0: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_04d5: ldftn instance string Program/'<>c'::'
b__7_15'() - IL_04db: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_052f: ldloc.0 + IL_0530: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_15' + IL_0535: dup + IL_0536: brtrue.s IL_054f + + IL_0538: pop + IL_0539: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_053e: ldftn instance string Program/'<>c'::'
b__7_15'() + IL_0544: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_04e0: dup - IL_04e1: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_15' - IL_04e6: ldstr "System.String System.String hello hello2" - IL_04eb: ldstr "Static generic 1 string" - IL_04f0: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0549: dup + IL_054a: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_15' + IL_054f: ldstr "System.String System.String hello hello2" + IL_0554: ldstr "Static generic 1 string" + IL_0559: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_04f5: ldloc.0 - IL_04f6: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_16' - IL_04fb: dup - IL_04fc: brtrue.s IL_0515 - - IL_04fe: pop - IL_04ff: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_0504: ldftn instance string Program/'<>c'::'
b__7_16'() - IL_050a: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_055e: ldloc.0 + IL_055f: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_16' + IL_0564: dup + IL_0565: brtrue.s IL_057e + + IL_0567: pop + IL_0568: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_056d: ldftn instance string Program/'<>c'::'
b__7_16'() + IL_0573: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_050f: dup - IL_0510: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_16' - IL_0515: ldstr "System.Object System.String hello hello2" - IL_051a: ldstr "Static generic 1 object" - IL_051f: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0578: dup + IL_0579: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_16' + IL_057e: ldstr "System.Object System.String hello hello2" + IL_0583: ldstr "Static generic 1 object" + IL_0588: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0524: ldloc.0 - IL_0525: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_17' - IL_052a: dup - IL_052b: brtrue.s IL_0544 - - IL_052d: pop - IL_052e: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_0533: ldftn instance string Program/'<>c'::'
b__7_17'() - IL_0539: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_058d: ldloc.0 + IL_058e: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_17' + IL_0593: dup + IL_0594: brtrue.s IL_05ad + + IL_0596: pop + IL_0597: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_059c: ldftn instance string Program/'<>c'::'
b__7_17'() + IL_05a2: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_053e: dup - IL_053f: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_17' - IL_0544: ldstr "System.Int32 System.String 5 hello2" - IL_0549: ldstr "Static generic 1 int" - IL_054e: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_05a7: dup + IL_05a8: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_17' + IL_05ad: ldstr "System.Int32 System.String 5 hello2" + IL_05b2: ldstr "Static generic 1 int" + IL_05b7: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0553: ldloc.0 - IL_0554: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_18' - IL_0559: dup - IL_055a: brtrue.s IL_0573 - - IL_055c: pop - IL_055d: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_0562: ldftn instance string Program/'<>c'::'
b__7_18'() - IL_0568: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_05bc: ldloc.0 + IL_05bd: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_18' + IL_05c2: dup + IL_05c3: brtrue.s IL_05dc + + IL_05c5: pop + IL_05c6: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_05cb: ldftn instance string Program/'<>c'::'
b__7_18'() + IL_05d1: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_056d: dup - IL_056e: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_18' - IL_0573: ldstr "System.Object System.String hello hello2" - IL_0578: ldstr "Static generic 0" - IL_057d: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_05d6: dup + IL_05d7: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_18' + IL_05dc: ldstr "System.Object System.String hello hello2" + IL_05e1: ldstr "Static generic 0" + IL_05e6: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0582: ldloc.0 - IL_0583: ldloc.0 - IL_0584: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__19'() - IL_058a: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_05eb: ldloc.0 + IL_05ec: ldloc.0 + IL_05ed: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__19'() + IL_05f3: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_058f: ldstr "System.String System.Int32 System.Object System.St" + IL_05f8: ldstr "System.String System.Int32 System.Object System.St" + "ring a 5 b c" - IL_0594: ldstr "Instance generic 4" - IL_0599: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_05fd: ldstr "Instance generic 4" + IL_0602: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_059e: ldloc.0 - IL_059f: ldloc.0 - IL_05a0: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__20'() - IL_05a6: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0607: ldloc.0 + IL_0608: ldloc.0 + IL_0609: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__20'() + IL_060f: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_05ab: ldstr "System.String System.Int32 System.Object System.St" + IL_0614: ldstr "System.String System.Int32 System.Object System.St" + "ring a 5 b c" - IL_05b0: ldstr "Virtual instance generic 4" - IL_05b5: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0619: ldstr "Virtual instance generic 4" + IL_061e: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_05ba: ldloc.0 - IL_05bb: ldloc.0 - IL_05bc: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__21'() - IL_05c2: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0623: ldloc.0 + IL_0624: ldloc.0 + IL_0625: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__21'() + IL_062b: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_05c7: ldstr "System.String System.Int32 System.String System.Ob" + IL_0630: ldstr "System.String System.Int32 System.String System.Ob" + "ject a 5 c d" - IL_05cc: ldstr "Interface generic 4" - IL_05d1: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0635: ldstr "Interface generic 4" + IL_063a: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_05d6: ldloc.0 - IL_05d7: ldloc.0 - IL_05d8: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__22'() - IL_05de: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_063f: ldloc.0 + IL_0640: ldloc.0 + IL_0641: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__22'() + IL_0647: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_05e3: ldstr "System.String System.Int32 a 5" - IL_05e8: ldstr "Interface generic forward G" - IL_05ed: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_064c: ldstr "System.String System.Int32 a 5" + IL_0651: ldstr "Interface generic forward G" + IL_0656: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_05f2: ldloc.0 - IL_05f3: ldloc.0 - IL_05f4: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__23'() - IL_05fa: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_065b: ldloc.0 + IL_065c: ldloc.0 + IL_065d: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__23'() + IL_0663: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_05ff: ldstr "System.String System.Object System.Int32 System.Ob" + IL_0668: ldstr "System.String System.Object System.Int32 System.Ob" + "ject a b 5 d" - IL_0604: ldstr "Interface generic 0" - IL_0609: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_066d: ldstr "Interface generic 0" + IL_0672: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_060e: ldloc.0 - IL_060f: ldloc.0 - IL_0610: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__24'() - IL_0616: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0677: ldloc.0 + IL_0678: ldloc.0 + IL_0679: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__24'() + IL_067f: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_061b: ldstr "System.String System.Object a b" - IL_0620: ldstr "Interface generic without generics on method" - IL_0625: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0684: ldstr "System.String System.Object a b" + IL_0689: ldstr "Interface generic without generics on method" + IL_068e: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_062a: ldloc.0 - IL_062b: ldloc.0 - IL_062c: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__25'() - IL_0632: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0693: ldloc.0 + IL_0694: ldloc.0 + IL_0695: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__25'() + IL_069b: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_0637: ldstr "System.String System.Object" - IL_063c: ldstr "Abstract generic with generic on method 1" - IL_0641: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_06a0: ldstr "System.String System.Object" + IL_06a5: ldstr "Abstract generic with generic on method 1" + IL_06aa: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0646: ldloc.0 - IL_0647: ldloc.0 - IL_0648: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__26'() - IL_064e: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_06af: ldloc.0 + IL_06b0: ldloc.0 + IL_06b1: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__26'() + IL_06b7: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_0653: ldstr "System.Int32 System.Object" - IL_0658: ldstr "Abstract generic with generic on method 2" - IL_065d: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_06bc: ldstr "System.Int32 System.Object" + IL_06c1: ldstr "Abstract generic with generic on method 2" + IL_06c6: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0662: ldloc.0 - IL_0663: ldloc.0 - IL_0664: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__27'() - IL_066a: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_06cb: ldloc.0 + IL_06cc: ldloc.0 + IL_06cd: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__27'() + IL_06d3: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_066f: ldstr "System.String" - IL_0674: ldstr "Abstract generic without generic on method 1" - IL_0679: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_06d8: ldstr "System.String" + IL_06dd: ldstr "Abstract generic without generic on method 1" + IL_06e2: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_067e: ldloc.0 - IL_067f: ldloc.0 - IL_0680: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__28'() - IL_0686: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_06e7: ldloc.0 + IL_06e8: ldloc.0 + IL_06e9: ldftn instance string Program/'<>c__DisplayClass7_0'::'
b__28'() + IL_06ef: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_068b: ldstr "System.Int32" - IL_0690: ldstr "Abstract generic without generic on method 2" - IL_0695: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_06f4: ldstr "System.Int32" + IL_06f9: ldstr "Abstract generic without generic on method 2" + IL_06fe: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_069a: ldloc.0 - IL_069b: ldc.i4 0xf4240 - IL_06a0: newarr [System.Runtime]System.Int32 - IL_06a5: stfld int32[] Program/'<>c__DisplayClass7_0'::a - IL_06aa: ldloc.0 - IL_06ab: ldfld int32[] Program/'<>c__DisplayClass7_0'::a - IL_06b0: ldc.i4.s 99 - IL_06b2: ldc.i4.1 - IL_06b3: stelem.i4 - IL_06b4: ldloc.0 - IL_06b5: ldloc.0 - IL_06b6: ldftn instance int32 Program/'<>c__DisplayClass7_0'::'
b__29'() - IL_06bc: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_0703: ldloc.0 + IL_0704: ldc.i4 0xf4240 + IL_0709: newarr [System.Runtime]System.Int32 + IL_070e: stfld int32[] Program/'<>c__DisplayClass7_0'::a + IL_0713: ldloc.0 + IL_0714: ldfld int32[] Program/'<>c__DisplayClass7_0'::a + IL_0719: ldc.i4.s 99 + IL_071b: ldc.i4.1 + IL_071c: stelem.i4 + IL_071d: ldloc.0 + IL_071e: ldloc.0 + IL_071f: ldftn instance int32 Program/'<>c__DisplayClass7_0'::'
b__29'() + IL_0725: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_06c1: ldloc.0 - IL_06c2: ldfld int32[] Program/'<>c__DisplayClass7_0'::a - IL_06c7: ldlen - IL_06c8: conv.i4 - IL_06c9: ldc.i4.1 - IL_06ca: add - IL_06cb: ldstr "Instantiating stub direct" - IL_06d0: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_072a: ldloc.0 + IL_072b: ldfld int32[] Program/'<>c__DisplayClass7_0'::a + IL_0730: ldlen + IL_0731: conv.i4 + IL_0732: ldc.i4.1 + IL_0733: add + IL_0734: ldstr "Instantiating stub direct" + IL_0739: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_06d5: ldloc.0 - IL_06d6: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_30' - IL_06db: dup - IL_06dc: brtrue.s IL_06f5 - - IL_06de: pop - IL_06df: ldsfld class Program/'<>c' Program/'<>c'::'<>9' - IL_06e4: ldftn instance int32 Program/'<>c'::'
b__7_30'() - IL_06ea: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, + IL_073e: ldloc.0 + IL_073f: ldsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_30' + IL_0744: dup + IL_0745: brtrue.s IL_075e + + IL_0747: pop + IL_0748: ldsfld class Program/'<>c' Program/'<>c'::'<>9' + IL_074d: ldftn instance int32 Program/'<>c'::'
b__7_30'() + IL_0753: newobj instance void class [System.Runtime]System.Func`1::.ctor(object, native int) - IL_06ef: dup - IL_06f0: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_30' - IL_06f5: ldc.i4.1 - IL_06f6: ldstr "Virtual call where computing \"this\" has side effects" - IL_06fb: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, + IL_0758: dup + IL_0759: stsfld class [System.Runtime]System.Func`1 Program/'<>c'::'<>9__7_30' + IL_075e: ldc.i4.1 + IL_075f: ldstr "Virtual call where computing \"this\" has side effects" + IL_0764: callvirt instance void Program/'<>c__DisplayClass7_0'::'
g__Test|0'(class [System.Runtime]System.Func`1, !!0, string) - IL_0700: ldloc.0 - IL_0701: ldfld bool Program/'<>c__DisplayClass7_0'::result - IL_0706: brfalse.s IL_0714 + IL_0769: ldloc.0 + IL_076a: ldfld bool Program/'<>c__DisplayClass7_0'::result + IL_076f: brfalse.s IL_077d - IL_0708: ldstr "All tailcall-via-help succeeded" - IL_070d: call void [System.Console]System.Console::WriteLine(string) - IL_0712: br.s IL_071e + IL_0771: ldstr "All tailcall-via-help succeeded" + IL_0776: call void [System.Console]System.Console::WriteLine(string) + IL_077b: br.s IL_0787 - IL_0714: ldstr "One or more failures in tailcall-via-help test" - IL_0719: call void [System.Console]System.Console::WriteLine(string) - IL_071e: ldloc.0 - IL_071f: ldfld bool Program/'<>c__DisplayClass7_0'::result - IL_0724: brtrue.s IL_0728 + IL_077d: ldstr "One or more failures in tailcall-via-help test" + IL_0782: call void [System.Console]System.Console::WriteLine(string) + IL_0787: ldloc.0 + IL_0788: ldfld bool Program/'<>c__DisplayClass7_0'::result + IL_078d: brtrue.s IL_0791 - IL_0726: ldc.i4.1 - IL_0727: ret + IL_078f: ldc.i4.1 + IL_0790: ret - IL_0728: ldc.i4.s 100 - IL_072a: ret + IL_0791: ldc.i4.s 100 + IL_0793: ret } // end of method Program::Main .method public hidebysig static void Calc(int32& x, @@ -2499,6 +2777,8 @@ .method private hidebysig static string GenName1Forward(!!T x) cil managed noinlining { + .param type T + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) // Code size 18 (0x12) .maxstack 2 .locals init (valuetype S32 V_0) @@ -2516,24 +2796,40 @@ GenName1(valuetype S32 s, !!T x) cil managed noinlining { - // Code size 32 (0x20) - .maxstack 8 - IL_0000: ldstr "{0} {1}" - IL_0005: ldtoken !!T - IL_000a: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_000f: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_0014: ldarg.1 - IL_0015: box !!T - IL_001a: call string [System.Runtime]System.String::Format(string, - object, - object) - IL_001f: ret + .param type T + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + // Code size 59 (0x3b) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.1 + IL_0003: ldc.i4.2 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldtoken !!T + IL_0010: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0015: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_001a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_001f: ldloca.s V_0 + IL_0021: ldstr " " + IL_0026: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_002b: ldloca.s V_0 + IL_002d: ldarg.1 + IL_002e: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0033: ldloca.s V_0 + IL_0035: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_003a: ret } // end of method Program::GenName1 .method private hidebysig static string GenName2ForwardBoth(!!T1 x, !!T2 y) cil managed noinlining { + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) // Code size 19 (0x13) .maxstack 3 .locals init (valuetype S32 V_0) @@ -2553,6 +2849,8 @@ GenName2ForwardOne(!!T x, string y) cil managed noinlining { + .param type T + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) // Code size 19 (0x13) .maxstack 3 .locals init (valuetype S32 V_0) @@ -2592,36 +2890,46 @@ !!T1 a, !!T2 b) cil managed noinlining { - // Code size 71 (0x47) - .maxstack 5 - IL_0000: ldstr "{0} {1} {2} {3}" - IL_0005: ldc.i4.4 - IL_0006: newarr [System.Runtime]System.Object - IL_000b: dup - IL_000c: ldc.i4.0 - IL_000d: ldtoken !!T1 - IL_0012: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0017: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_001c: stelem.ref - IL_001d: dup - IL_001e: ldc.i4.1 - IL_001f: ldtoken !!T2 - IL_0024: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0029: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_002e: stelem.ref - IL_002f: dup - IL_0030: ldc.i4.2 - IL_0031: ldarg.1 - IL_0032: box !!T1 - IL_0037: stelem.ref - IL_0038: dup - IL_0039: ldc.i4.3 - IL_003a: ldarg.2 - IL_003b: box !!T2 - IL_0040: stelem.ref - IL_0041: call string [System.Runtime]System.String::Format(string, - object[]) - IL_0046: ret + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + // Code size 113 (0x71) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.3 + IL_0003: ldc.i4.4 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldtoken !!T1 + IL_0010: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0015: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_001a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_001f: ldloca.s V_0 + IL_0021: ldstr " " + IL_0026: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_002b: ldloca.s V_0 + IL_002d: ldtoken !!T2 + IL_0032: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0037: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_003c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0041: ldloca.s V_0 + IL_0043: ldstr " " + IL_0048: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_004d: ldloca.s V_0 + IL_004f: ldarg.1 + IL_0050: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0055: ldloca.s V_0 + IL_0057: ldstr " " + IL_005c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0061: ldloca.s V_0 + IL_0063: ldarg.2 + IL_0064: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0069: ldloca.s V_0 + IL_006b: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_0070: ret } // end of method Program::GenName2 .method private hidebysig static string @@ -2631,6 +2939,14 @@ !!T4 d, class IGenInterface`2 igen) cil managed noinlining { + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T3 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T4 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) // Code size 23 (0x17) .maxstack 6 .locals init (valuetype S32 V_0) @@ -2656,6 +2972,10 @@ !!T2 b, class IGenInterface`2 igen) cil managed noinlining { + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) // Code size 20 (0x14) .maxstack 4 .locals init (valuetype S32 V_0) @@ -2770,6 +3090,11 @@ !!T c, valuetype [System.Runtime]System.Span`1 d) cil managed noinlining { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .param type T + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param [3] + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) // Code size 31 (0x1f) .maxstack 14 IL_0000: ldarg.2 @@ -2819,6 +3144,10 @@ valuetype [System.Runtime]System.Span`1 d, int32 result) cil managed noinlining { + .param type T + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param [11] + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) // Code size 31 (0x1f) .maxstack 4 IL_0000: ldarg.s a @@ -2873,6 +3202,8 @@ .class private auto ansi Instance extends [System.Runtime]System.Object { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field private static initonly native int s_calcInstanceCalli .field private static initonly native int s_calcInstanceCalliOther .field private static initonly native int s_calcInstanceCalliRetbuf @@ -3267,65 +3598,80 @@ valuetype SGC2 gc, int32& interior) cil managed noinlining { - // Code size 126 (0x7e) - .maxstack 5 - IL_0000: ldstr "{0} {1} {2} {3} {4} {5} {6} {7} {8}" - IL_0005: ldc.i4.s 9 - IL_0007: newarr [System.Runtime]System.Object - IL_000c: dup - IL_000d: ldc.i4.0 - IL_000e: ldarg.1 - IL_000f: stelem.ref - IL_0010: dup - IL_0011: ldc.i4.1 - IL_0012: ldarg.3 - IL_0013: ldfld int32 SGC2::A - IL_0018: box [System.Runtime]System.Int32 - IL_001d: stelem.ref - IL_001e: dup - IL_001f: ldc.i4.2 + // Code size 243 (0xf3) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.8 + IL_0003: ldc.i4.s 9 + IL_0005: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_000a: ldloca.s V_0 + IL_000c: ldarg.1 + IL_000d: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0012: ldloca.s V_0 + IL_0014: ldstr " " + IL_0019: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_001e: ldloca.s V_0 IL_0020: ldarg.3 - IL_0021: ldfld valuetype SGC SGC2::B - IL_0026: ldfld object SGC::A - IL_002b: stelem.ref - IL_002c: dup - IL_002d: ldc.i4.3 - IL_002e: ldarg.3 - IL_002f: ldfld valuetype SGC SGC2::B - IL_0034: ldfld object SGC::B - IL_0039: stelem.ref - IL_003a: dup - IL_003b: ldc.i4.4 - IL_003c: ldarg.3 - IL_003d: ldfld valuetype SGC SGC2::B - IL_0042: ldfld string SGC::C - IL_0047: stelem.ref - IL_0048: dup - IL_0049: ldc.i4.5 - IL_004a: ldarg.3 - IL_004b: ldfld valuetype SGC SGC2::B - IL_0050: ldfld string SGC::D - IL_0055: stelem.ref - IL_0056: dup - IL_0057: ldc.i4.6 - IL_0058: ldarg.3 - IL_0059: ldfld object SGC2::C - IL_005e: stelem.ref - IL_005f: dup - IL_0060: ldc.i4.7 - IL_0061: ldarg.3 - IL_0062: ldfld int32 SGC2::D - IL_0067: box [System.Runtime]System.Int32 - IL_006c: stelem.ref - IL_006d: dup - IL_006e: ldc.i4.8 - IL_006f: ldarg.s interior - IL_0071: ldind.i4 - IL_0072: box [System.Runtime]System.Int32 - IL_0077: stelem.ref - IL_0078: call string [System.Runtime]System.String::Format(string, - object[]) - IL_007d: ret + IL_0021: ldfld int32 SGC2::A + IL_0026: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_002b: ldloca.s V_0 + IL_002d: ldstr " " + IL_0032: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0037: ldloca.s V_0 + IL_0039: ldarg.3 + IL_003a: ldfld valuetype SGC SGC2::B + IL_003f: ldfld object SGC::A + IL_0044: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0049: ldloca.s V_0 + IL_004b: ldstr " " + IL_0050: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0055: ldloca.s V_0 + IL_0057: ldarg.3 + IL_0058: ldfld valuetype SGC SGC2::B + IL_005d: ldfld object SGC::B + IL_0062: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0067: ldloca.s V_0 + IL_0069: ldstr " " + IL_006e: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0073: ldloca.s V_0 + IL_0075: ldarg.3 + IL_0076: ldfld valuetype SGC SGC2::B + IL_007b: ldfld string SGC::C + IL_0080: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0085: ldloca.s V_0 + IL_0087: ldstr " " + IL_008c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0091: ldloca.s V_0 + IL_0093: ldarg.3 + IL_0094: ldfld valuetype SGC SGC2::B + IL_0099: ldfld string SGC::D + IL_009e: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_00a3: ldloca.s V_0 + IL_00a5: ldstr " " + IL_00aa: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00af: ldloca.s V_0 + IL_00b1: ldarg.3 + IL_00b2: ldfld object SGC2::C + IL_00b7: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00bc: ldloca.s V_0 + IL_00be: ldstr " " + IL_00c3: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00c8: ldloca.s V_0 + IL_00ca: ldarg.3 + IL_00cb: ldfld int32 SGC2::D + IL_00d0: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00d5: ldloca.s V_0 + IL_00d7: ldstr " " + IL_00dc: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00e1: ldloca.s V_0 + IL_00e3: ldarg.s interior + IL_00e5: ldind.i4 + IL_00e6: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00eb: ldloca.s V_0 + IL_00ed: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_00f2: ret } // end of method Instance::GCOther .method public hidebysig specialname rtspecialname @@ -3446,6 +3792,8 @@ .class private auto ansi beforefieldinit ClassImpl extends BaseClass { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field private int32 _x .field private class BaseClass 'k__BackingField' .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) @@ -3633,8 +3981,7 @@ IL_0006: ret } // end of method ClassImpl::.ctor - .property instance callconv(8) class BaseClass - Other() + .property instance class BaseClass Other() { .get instance class BaseClass ClassImpl::get_Other() .set instance void ClassImpl::set_Other(class BaseClass) @@ -3675,6 +4022,10 @@ extends [System.Runtime]System.Object implements IInterface { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .interfaceimpl type IInterface + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) .field private int32 _x .field private class IInterface 'k__BackingField' .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) @@ -3862,8 +4213,7 @@ IL_0006: ret } // end of method InterfaceImpl::.ctor - .property instance callconv(8) class IInterface - Other() + .property instance class IInterface Other() { .get instance class IInterface InterfaceImpl::get_Other() .set instance void InterfaceImpl::set_Other(class IInterface) @@ -3873,12 +4223,22 @@ .class private auto ansi beforefieldinit GenInstance`2 extends [System.Runtime]System.Object { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) .method public hidebysig instance string NonVirtForward(!T1 a, !T2 b, !!T3 c, !!T4 d) cil managed noinlining { + .param type T3 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T4 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) // Code size 23 (0x17) .maxstack 6 .locals init (valuetype S32 V_0) @@ -3905,6 +4265,10 @@ !!T3 c, !!T4 d) cil managed noinlining { + .param type T3 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T4 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) // Code size 23 (0x17) .maxstack 6 .locals init (valuetype S32 V_0) @@ -3932,58 +4296,74 @@ !!T3 c, !!T4 d) cil managed { - // Code size 127 (0x7f) - .maxstack 5 - IL_0000: ldstr "{0} {1} {2} {3} {4} {5} {6} {7}" - IL_0005: ldc.i4.8 - IL_0006: newarr [System.Runtime]System.Object - IL_000b: dup - IL_000c: ldc.i4.0 - IL_000d: ldtoken !T1 - IL_0012: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0017: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_001c: stelem.ref - IL_001d: dup - IL_001e: ldc.i4.1 - IL_001f: ldtoken !T2 - IL_0024: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0029: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_002e: stelem.ref - IL_002f: dup - IL_0030: ldc.i4.2 - IL_0031: ldtoken !!T3 - IL_0036: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_003b: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_0040: stelem.ref - IL_0041: dup - IL_0042: ldc.i4.3 - IL_0043: ldtoken !!T4 - IL_0048: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_004d: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_0052: stelem.ref - IL_0053: dup - IL_0054: ldc.i4.4 - IL_0055: ldarg.2 - IL_0056: box !T1 - IL_005b: stelem.ref - IL_005c: dup - IL_005d: ldc.i4.5 - IL_005e: ldarg.3 - IL_005f: box !T2 - IL_0064: stelem.ref - IL_0065: dup - IL_0066: ldc.i4.6 - IL_0067: ldarg.s c - IL_0069: box !!T3 - IL_006e: stelem.ref - IL_006f: dup - IL_0070: ldc.i4.7 - IL_0071: ldarg.s d - IL_0073: box !!T4 - IL_0078: stelem.ref - IL_0079: call string [System.Runtime]System.String::Format(string, - object[]) - IL_007e: ret + .param type T3 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T4 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + // Code size 223 (0xdf) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.7 + IL_0003: ldc.i4.8 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldtoken !T1 + IL_0010: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0015: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_001a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_001f: ldloca.s V_0 + IL_0021: ldstr " " + IL_0026: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_002b: ldloca.s V_0 + IL_002d: ldtoken !T2 + IL_0032: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0037: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_003c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0041: ldloca.s V_0 + IL_0043: ldstr " " + IL_0048: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_004d: ldloca.s V_0 + IL_004f: ldtoken !!T3 + IL_0054: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0059: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_005e: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0063: ldloca.s V_0 + IL_0065: ldstr " " + IL_006a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_006f: ldloca.s V_0 + IL_0071: ldtoken !!T4 + IL_0076: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_007b: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_0080: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0085: ldloca.s V_0 + IL_0087: ldstr " " + IL_008c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0091: ldloca.s V_0 + IL_0093: ldarg.2 + IL_0094: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0099: ldloca.s V_0 + IL_009b: ldstr " " + IL_00a0: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00a5: ldloca.s V_0 + IL_00a7: ldarg.3 + IL_00a8: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00ad: ldloca.s V_0 + IL_00af: ldstr " " + IL_00b4: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00b9: ldloca.s V_0 + IL_00bb: ldarg.s c + IL_00bd: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00c2: ldloca.s V_0 + IL_00c4: ldstr " " + IL_00c9: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00ce: ldloca.s V_0 + IL_00d0: ldarg.s d + IL_00d2: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00d7: ldloca.s V_0 + IL_00d9: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_00de: ret } // end of method GenInstance`2::NonVirt .method public hidebysig newslot virtual @@ -3993,58 +4373,74 @@ !!T3 c, !!T4 d) cil managed { - // Code size 127 (0x7f) - .maxstack 5 - IL_0000: ldstr "{0} {1} {2} {3} {4} {5} {6} {7}" - IL_0005: ldc.i4.8 - IL_0006: newarr [System.Runtime]System.Object - IL_000b: dup - IL_000c: ldc.i4.0 - IL_000d: ldtoken !T1 - IL_0012: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0017: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_001c: stelem.ref - IL_001d: dup - IL_001e: ldc.i4.1 - IL_001f: ldtoken !T2 - IL_0024: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0029: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_002e: stelem.ref - IL_002f: dup - IL_0030: ldc.i4.2 - IL_0031: ldtoken !!T3 - IL_0036: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_003b: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_0040: stelem.ref - IL_0041: dup - IL_0042: ldc.i4.3 - IL_0043: ldtoken !!T4 - IL_0048: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_004d: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_0052: stelem.ref - IL_0053: dup - IL_0054: ldc.i4.4 - IL_0055: ldarg.2 - IL_0056: box !T1 - IL_005b: stelem.ref - IL_005c: dup - IL_005d: ldc.i4.5 - IL_005e: ldarg.3 - IL_005f: box !T2 - IL_0064: stelem.ref - IL_0065: dup - IL_0066: ldc.i4.6 - IL_0067: ldarg.s c - IL_0069: box !!T3 - IL_006e: stelem.ref - IL_006f: dup - IL_0070: ldc.i4.7 - IL_0071: ldarg.s d - IL_0073: box !!T4 - IL_0078: stelem.ref - IL_0079: call string [System.Runtime]System.String::Format(string, - object[]) - IL_007e: ret + .param type T3 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T4 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + // Code size 223 (0xdf) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.7 + IL_0003: ldc.i4.8 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldtoken !T1 + IL_0010: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0015: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_001a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_001f: ldloca.s V_0 + IL_0021: ldstr " " + IL_0026: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_002b: ldloca.s V_0 + IL_002d: ldtoken !T2 + IL_0032: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0037: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_003c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0041: ldloca.s V_0 + IL_0043: ldstr " " + IL_0048: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_004d: ldloca.s V_0 + IL_004f: ldtoken !!T3 + IL_0054: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0059: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_005e: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0063: ldloca.s V_0 + IL_0065: ldstr " " + IL_006a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_006f: ldloca.s V_0 + IL_0071: ldtoken !!T4 + IL_0076: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_007b: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_0080: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0085: ldloca.s V_0 + IL_0087: ldstr " " + IL_008c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0091: ldloca.s V_0 + IL_0093: ldarg.2 + IL_0094: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0099: ldloca.s V_0 + IL_009b: ldstr " " + IL_00a0: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00a5: ldloca.s V_0 + IL_00a7: ldarg.3 + IL_00a8: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00ad: ldloca.s V_0 + IL_00af: ldstr " " + IL_00b4: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00b9: ldloca.s V_0 + IL_00bb: ldarg.s c + IL_00bd: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00c2: ldloca.s V_0 + IL_00c4: ldstr " " + IL_00c9: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00ce: ldloca.s V_0 + IL_00d0: ldarg.s d + IL_00d2: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00d7: ldloca.s V_0 + IL_00d9: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_00de: ret } // end of method GenInstance`2::Virt .method public hidebysig specialname rtspecialname @@ -4061,6 +4457,11 @@ .class interface private abstract auto ansi IGenInterface`2 { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) .method public hidebysig newslot abstract virtual instance string F(valuetype S32 s, !T1 a, @@ -4068,6 +4469,10 @@ !!T3 c, !!T4 d) cil managed { + .param type T3 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T4 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) } // end of method IGenInterface`2::F .method public hidebysig newslot abstract virtual @@ -4083,6 +4488,14 @@ extends [System.Runtime]System.Object implements class IGenInterface`2 { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .interfaceimpl type class IGenInterface`2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8[]) = ( 01 00 03 00 00 00 00 01 01 00 00 ) + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) .method public hidebysig newslot virtual final instance string F(valuetype S32 s, !T1 a, @@ -4090,58 +4503,74 @@ !!T3 c, !!T4 d) cil managed { - // Code size 127 (0x7f) - .maxstack 5 - IL_0000: ldstr "{0} {1} {2} {3} {4} {5} {6} {7}" - IL_0005: ldc.i4.8 - IL_0006: newarr [System.Runtime]System.Object - IL_000b: dup - IL_000c: ldc.i4.0 - IL_000d: ldtoken !T1 - IL_0012: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0017: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_001c: stelem.ref - IL_001d: dup - IL_001e: ldc.i4.1 - IL_001f: ldtoken !T2 - IL_0024: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0029: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_002e: stelem.ref - IL_002f: dup - IL_0030: ldc.i4.2 - IL_0031: ldtoken !!T3 - IL_0036: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_003b: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_0040: stelem.ref - IL_0041: dup - IL_0042: ldc.i4.3 - IL_0043: ldtoken !!T4 - IL_0048: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_004d: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_0052: stelem.ref - IL_0053: dup - IL_0054: ldc.i4.4 - IL_0055: ldarg.2 - IL_0056: box !T1 - IL_005b: stelem.ref - IL_005c: dup - IL_005d: ldc.i4.5 - IL_005e: ldarg.3 - IL_005f: box !T2 - IL_0064: stelem.ref - IL_0065: dup - IL_0066: ldc.i4.6 - IL_0067: ldarg.s c - IL_0069: box !!T3 - IL_006e: stelem.ref - IL_006f: dup - IL_0070: ldc.i4.7 - IL_0071: ldarg.s d - IL_0073: box !!T4 - IL_0078: stelem.ref - IL_0079: call string [System.Runtime]System.String::Format(string, - object[]) - IL_007e: ret + .param type T3 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + .param type T4 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) + // Code size 223 (0xdf) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.7 + IL_0003: ldc.i4.8 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldtoken !T1 + IL_0010: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0015: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_001a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_001f: ldloca.s V_0 + IL_0021: ldstr " " + IL_0026: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_002b: ldloca.s V_0 + IL_002d: ldtoken !T2 + IL_0032: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0037: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_003c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0041: ldloca.s V_0 + IL_0043: ldstr " " + IL_0048: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_004d: ldloca.s V_0 + IL_004f: ldtoken !!T3 + IL_0054: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0059: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_005e: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0063: ldloca.s V_0 + IL_0065: ldstr " " + IL_006a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_006f: ldloca.s V_0 + IL_0071: ldtoken !!T4 + IL_0076: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_007b: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_0080: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0085: ldloca.s V_0 + IL_0087: ldstr " " + IL_008c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0091: ldloca.s V_0 + IL_0093: ldarg.2 + IL_0094: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0099: ldloca.s V_0 + IL_009b: ldstr " " + IL_00a0: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00a5: ldloca.s V_0 + IL_00a7: ldarg.3 + IL_00a8: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00ad: ldloca.s V_0 + IL_00af: ldstr " " + IL_00b4: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00b9: ldloca.s V_0 + IL_00bb: ldarg.s c + IL_00bd: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00c2: ldloca.s V_0 + IL_00c4: ldstr " " + IL_00c9: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_00ce: ldloca.s V_0 + IL_00d0: ldarg.s d + IL_00d2: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_00d7: ldloca.s V_0 + IL_00d9: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_00de: ret } // end of method GenInterfaceImpl`2::F .method public hidebysig newslot virtual final @@ -4149,36 +4578,42 @@ !T1 a, !T2 b) cil managed { - // Code size 71 (0x47) - .maxstack 5 - IL_0000: ldstr "{0} {1} {2} {3}" - IL_0005: ldc.i4.4 - IL_0006: newarr [System.Runtime]System.Object - IL_000b: dup - IL_000c: ldc.i4.0 - IL_000d: ldtoken !T1 - IL_0012: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0017: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_001c: stelem.ref - IL_001d: dup - IL_001e: ldc.i4.1 - IL_001f: ldtoken !T2 - IL_0024: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) - IL_0029: callvirt instance string [System.Runtime]System.Type::get_FullName() - IL_002e: stelem.ref - IL_002f: dup - IL_0030: ldc.i4.2 - IL_0031: ldarg.2 - IL_0032: box !T1 - IL_0037: stelem.ref - IL_0038: dup - IL_0039: ldc.i4.3 - IL_003a: ldarg.3 - IL_003b: box !T2 - IL_0040: stelem.ref - IL_0041: call string [System.Runtime]System.String::Format(string, - object[]) - IL_0046: ret + // Code size 113 (0x71) + .maxstack 3 + .locals init (valuetype [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.3 + IL_0003: ldc.i4.4 + IL_0004: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::.ctor(int32, + int32) + IL_0009: ldloca.s V_0 + IL_000b: ldtoken !T1 + IL_0010: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0015: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_001a: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_001f: ldloca.s V_0 + IL_0021: ldstr " " + IL_0026: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_002b: ldloca.s V_0 + IL_002d: ldtoken !T2 + IL_0032: call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + IL_0037: callvirt instance string [System.Runtime]System.Type::get_FullName() + IL_003c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(string) + IL_0041: ldloca.s V_0 + IL_0043: ldstr " " + IL_0048: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_004d: ldloca.s V_0 + IL_004f: ldarg.2 + IL_0050: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0055: ldloca.s V_0 + IL_0057: ldstr " " + IL_005c: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendLiteral(string) + IL_0061: ldloca.s V_0 + IL_0063: ldarg.3 + IL_0064: call instance void [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::AppendFormatted(!!0) + IL_0069: ldloca.s V_0 + IL_006b: call instance string [System.Runtime]System.Runtime.CompilerServices.DefaultInterpolatedStringHandler::ToStringAndClear() + IL_0070: ret } // end of method GenInterfaceImpl`2::G .method public hidebysig specialname rtspecialname @@ -4196,9 +4631,15 @@ .class private abstract auto ansi beforefieldinit GenAbstract`1 extends [System.Runtime]System.Object { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 00 00 00 ) + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) .method public hidebysig newslot abstract virtual instance string F() cil managed { + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) } // end of method GenAbstract`1::F .method public hidebysig newslot abstract virtual @@ -4221,9 +4662,15 @@ .class private auto ansi beforefieldinit GenAbstractImpl`1 extends class GenAbstract`1 { + .custom instance void System.Runtime.CompilerServices.NullableContextAttribute::.ctor(uint8) = ( 01 00 01 00 00 ) + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8[]) = ( 01 00 02 00 00 00 00 01 00 00 ) + .param type T1 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) .method public hidebysig virtual instance string F() cil managed { + .param type T2 + .custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(uint8) = ( 01 00 02 00 00 ) // Code size 41 (0x29) .maxstack 8 IL_0000: ldtoken !T1 @@ -4270,12 +4717,11 @@ .class private auto ansi more_tailcalls_ProcessedByFody extends [System.Runtime]System.Object { - .field static assembly literal string FodyVersion = "6.2.4.0" - .field static assembly literal string InlineIL = "1.5.0.0" + .field static assembly literal string FodyVersion = "6.6.4.0" + .field static assembly literal string InlineIL = "1.7.4.0" } // end of class more_tailcalls_ProcessedByFody // ============================================================= // *********** DISASSEMBLY COMPLETE *********************** -// WARNING: Created Win32 resource file more_tailcalls.res diff --git a/src/tests/JIT/Directed/tailcall/more_tailcalls.ilproj b/src/tests/JIT/Directed/tailcall/more_tailcalls.ilproj index 9e0bc4c27a656c..3f6be099a84e6e 100644 --- a/src/tests/JIT/Directed/tailcall/more_tailcalls.ilproj +++ b/src/tests/JIT/Directed/tailcall/more_tailcalls.ilproj @@ -1,6 +1,7 @@ - Exe + + true PdbOnly diff --git a/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj b/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj index 27be898bddbee7..83624287a592ec 100644 --- a/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj +++ b/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj @@ -1,6 +1,7 @@ - Exe + + true True diff --git a/src/tests/JIT/Directed/tailcall/tailcall.ilproj b/src/tests/JIT/Directed/tailcall/tailcall.ilproj index 9e0bc4c27a656c..f55744c790fa89 100644 --- a/src/tests/JIT/Directed/tailcall/tailcall.ilproj +++ b/src/tests/JIT/Directed/tailcall/tailcall.ilproj @@ -1,6 +1,7 @@ - Exe + + true PdbOnly diff --git a/src/tests/JIT/Directed/throwbox/fault.il b/src/tests/JIT/Directed/throwbox/fault.il index 6973caff7ce614..0d88d60522bfca 100644 --- a/src/tests/JIT/Directed/throwbox/fault.il +++ b/src/tests/JIT/Directed/throwbox/fault.il @@ -8,14 +8,13 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly 'fault' { } +.assembly 'fault_throwbox' { } .namespace JitTest { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/throwbox/fault.ilproj b/src/tests/JIT/Directed/throwbox/fault_throwbox.ilproj similarity index 75% rename from src/tests/JIT/Directed/throwbox/fault.ilproj rename to src/tests/JIT/Directed/throwbox/fault_throwbox.ilproj index 16670f7930e353..b66a0bced144f9 100644 --- a/src/tests/JIT/Directed/throwbox/fault.ilproj +++ b/src/tests/JIT/Directed/throwbox/fault_throwbox.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/throwbox/filter.il b/src/tests/JIT/Directed/throwbox/filter.il index e9b737e4c0be71..d98bd4e2e680eb 100644 --- a/src/tests/JIT/Directed/throwbox/filter.il +++ b/src/tests/JIT/Directed/throwbox/filter.il @@ -11,11 +11,10 @@ .assembly 'filter' { } .namespace JitTest { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/throwbox/filter.ilproj b/src/tests/JIT/Directed/throwbox/filter.ilproj index fe11d05fad65d9..15b358fd0d448e 100644 --- a/src/tests/JIT/Directed/throwbox/filter.ilproj +++ b/src/tests/JIT/Directed/throwbox/filter.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/throwbox/finally.il b/src/tests/JIT/Directed/throwbox/finally.il index 93698e1b4a0ea1..0cc4098dc481f1 100644 --- a/src/tests/JIT/Directed/throwbox/finally.il +++ b/src/tests/JIT/Directed/throwbox/finally.il @@ -11,11 +11,10 @@ .assembly 'finally' { } .namespace JitTest { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/throwbox/finally.ilproj b/src/tests/JIT/Directed/throwbox/finally.ilproj index 445f8c0b7e3c7a..034763923b36bd 100644 --- a/src/tests/JIT/Directed/throwbox/finally.ilproj +++ b/src/tests/JIT/Directed/throwbox/finally.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/throwbox/rethrow.il b/src/tests/JIT/Directed/throwbox/rethrow.il index 35ae886c50e784..1394ddc830bf11 100644 --- a/src/tests/JIT/Directed/throwbox/rethrow.il +++ b/src/tests/JIT/Directed/throwbox/rethrow.il @@ -11,11 +11,10 @@ .assembly 'rethrow' { } .namespace JitTest { - .class private auto ansi beforefieldinit Test + .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/throwbox/rethrow.ilproj b/src/tests/JIT/Directed/throwbox/rethrow.ilproj index a140225c9d7ee0..73fce1167aac83 100644 --- a/src/tests/JIT/Directed/throwbox/rethrow.ilproj +++ b/src/tests/JIT/Directed/throwbox/rethrow.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/tls/MutualRecurThd-TLS.il b/src/tests/JIT/Directed/tls/MutualRecurThd-TLS.il index 5d2fcc62681ec1..fcb065e229029a 100644 --- a/src/tests/JIT/Directed/tls/MutualRecurThd-TLS.il +++ b/src/tests/JIT/Directed/tls/MutualRecurThd-TLS.il @@ -3,11 +3,12 @@ .assembly extern System.Console { auto } +.assembly extern xunit.core {} .assembly extern System.Threading.Thread { auto } .assembly extern legacy library mscorlib { auto } -.assembly mutualrecurthdtls +.assembly 'mutualrecurthd-tls_' { } .data tls FieldData = int32(32) @@ -3242,6 +3243,9 @@ stsfld int32 Thread_EA::TLSFieldData .method public static int32 main() il managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 4 .locals (class [System.Threading.Thread]System.Threading.Thread[] thrd, diff --git a/src/tests/JIT/Directed/tls/Test-TLS.il b/src/tests/JIT/Directed/tls/Test-TLS.il index 0704e219dcaa78..eda1fa932533d2 100644 --- a/src/tests/JIT/Directed/tls/Test-TLS.il +++ b/src/tests/JIT/Directed/tls/Test-TLS.il @@ -1,5 +1,6 @@ .assembly extern legacy library mscorlib {} -.assembly testtls +.assembly extern xunit.core {} +.assembly 'test-tls_' { } .data tls FieldData = int32(51966) @@ -8,6 +9,9 @@ .field public static int32 TLSFieldData at FieldData .method public static int32 main() { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint ldsfld int32 test::TLSFieldData stsfld int32 test::TLSFieldData diff --git a/src/tests/JIT/Directed/tls/mutualrecurthd-tls.ilproj b/src/tests/JIT/Directed/tls/mutualrecurthd-tls_.ilproj similarity index 92% rename from src/tests/JIT/Directed/tls/mutualrecurthd-tls.ilproj rename to src/tests/JIT/Directed/tls/mutualrecurthd-tls_.ilproj index 3b2597639f2b8d..4e6ca1703622a4 100644 --- a/src/tests/JIT/Directed/tls/mutualrecurthd-tls.ilproj +++ b/src/tests/JIT/Directed/tls/mutualrecurthd-tls_.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/tls/test-tls.ilproj b/src/tests/JIT/Directed/tls/test-tls_.ilproj similarity index 92% rename from src/tests/JIT/Directed/tls/test-tls.ilproj rename to src/tests/JIT/Directed/tls/test-tls_.ilproj index af94f9741dbf62..0853bde29add51 100644 --- a/src/tests/JIT/Directed/tls/test-tls.ilproj +++ b/src/tests/JIT/Directed/tls/test-tls_.ilproj @@ -1,6 +1,5 @@ - Exe 1 true diff --git a/src/tests/JIT/Directed/zeroinit/Dev10_863995.ilproj b/src/tests/JIT/Directed/zeroinit/Dev10_863995.ilproj index 28b3a86b805750..be5346fbe0cf44 100644 --- a/src/tests/JIT/Directed/zeroinit/Dev10_863995.ilproj +++ b/src/tests/JIT/Directed/zeroinit/Dev10_863995.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/zeroinit/init_byte.il b/src/tests/JIT/Directed/zeroinit/init_byte.il index 2a721820b2b5d5..cad4187c88e3c8 100644 --- a/src/tests/JIT/Directed/zeroinit/init_byte.il +++ b/src/tests/JIT/Directed/zeroinit/init_byte.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly init_byte { } -.class private auto ansi beforefieldinit Test_init_byte +.class public auto ansi beforefieldinit Test_init_byte extends [mscorlib]System.Object { .field private int8 m_ret @@ -429,7 +429,7 @@ IL_000e: ret } // end of method Test::test22 - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/zeroinit/init_byte.ilproj b/src/tests/JIT/Directed/zeroinit/init_byte.ilproj index e58048f2df849b..3689d1adc32d35 100644 --- a/src/tests/JIT/Directed/zeroinit/init_byte.ilproj +++ b/src/tests/JIT/Directed/zeroinit/init_byte.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/zeroinit/init_int32.il b/src/tests/JIT/Directed/zeroinit/init_int32.il index f9be1f5c637a3b..a0c8a517d5d00c 100644 --- a/src/tests/JIT/Directed/zeroinit/init_int32.il +++ b/src/tests/JIT/Directed/zeroinit/init_int32.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly init_int32 { } -.class private auto ansi beforefieldinit Test_init_int32 +.class public auto ansi beforefieldinit Test_init_int32 extends [mscorlib]System.Object { .field private int32 m_ret @@ -415,8 +415,7 @@ IL_000e: ret } // end of method Test::test22 - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/zeroinit/init_int32.ilproj b/src/tests/JIT/Directed/zeroinit/init_int32.ilproj index d2c5760cf2e544..1accf570cfdb22 100644 --- a/src/tests/JIT/Directed/zeroinit/init_int32.ilproj +++ b/src/tests/JIT/Directed/zeroinit/init_int32.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/zeroinit/init_int64.il b/src/tests/JIT/Directed/zeroinit/init_int64.il index 124e01d68373d1..b0dfeea29655ca 100644 --- a/src/tests/JIT/Directed/zeroinit/init_int64.il +++ b/src/tests/JIT/Directed/zeroinit/init_int64.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly init_int64 { } -.class private auto ansi beforefieldinit Test_init_int64 +.class public auto ansi beforefieldinit Test_init_int64 extends [mscorlib]System.Object { .field private int64 m_ret @@ -429,7 +429,7 @@ IL_000e: ret } // end of method Test::test22 - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/zeroinit/init_int64.ilproj b/src/tests/JIT/Directed/zeroinit/init_int64.ilproj index 69284a32eeb809..1fb82f371be75f 100644 --- a/src/tests/JIT/Directed/zeroinit/init_int64.ilproj +++ b/src/tests/JIT/Directed/zeroinit/init_int64.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/zeroinit/init_struct.il b/src/tests/JIT/Directed/zeroinit/init_struct.il index da55918580a8b2..ca8aff4d02caa0 100644 --- a/src/tests/JIT/Directed/zeroinit/init_struct.il +++ b/src/tests/JIT/Directed/zeroinit/init_struct.il @@ -16,7 +16,7 @@ .field public int64 val } // end of class Val -.class private auto ansi beforefieldinit Test_init_struct +.class public auto ansi beforefieldinit Test_init_struct extends [mscorlib]System.Object { .field private int64 m_ret @@ -475,8 +475,7 @@ IL_0019: ret } // end of method Test::test22 - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/zeroinit/init_struct.ilproj b/src/tests/JIT/Directed/zeroinit/init_struct.ilproj index 3834a7126108d3..92229c2f3efef7 100644 --- a/src/tests/JIT/Directed/zeroinit/init_struct.ilproj +++ b/src/tests/JIT/Directed/zeroinit/init_struct.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Directed/zeroinit/init_uint32.il b/src/tests/JIT/Directed/zeroinit/init_uint32.il index 4fb204c4af0e40..76bbe65f6522e3 100644 --- a/src/tests/JIT/Directed/zeroinit/init_uint32.il +++ b/src/tests/JIT/Directed/zeroinit/init_uint32.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly init_uint32 { } -.class private auto ansi beforefieldinit Test_init_uint32 +.class public auto ansi beforefieldinit Test_init_uint32 extends [mscorlib]System.Object { .field private unsigned int32 m_ret @@ -415,8 +415,7 @@ IL_000e: ret } // end of method Test::test22 - .method private hidebysig static unsigned int32 - Main() cil managed + .method public hidebysig static unsigned int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/zeroinit/init_uint32.ilproj b/src/tests/JIT/Directed/zeroinit/init_uint32.ilproj index 1d1b7450ac3612..8cb310fa152aef 100644 --- a/src/tests/JIT/Directed/zeroinit/init_uint32.ilproj +++ b/src/tests/JIT/Directed/zeroinit/init_uint32.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/zeroinit/init_uint64.il b/src/tests/JIT/Directed/zeroinit/init_uint64.il index c3b2e2a9f75409..09136151f4241a 100644 --- a/src/tests/JIT/Directed/zeroinit/init_uint64.il +++ b/src/tests/JIT/Directed/zeroinit/init_uint64.il @@ -9,7 +9,7 @@ .ver 4:0:0:0 } .assembly init_uint64 { } -.class private auto ansi beforefieldinit Test_init_uint64 +.class public auto ansi beforefieldinit Test_init_uint64 extends [mscorlib]System.Object { .field private unsigned int64 m_ret @@ -429,7 +429,7 @@ IL_000e: ret } // end of method Test::test22 - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/zeroinit/init_uint64.ilproj b/src/tests/JIT/Directed/zeroinit/init_uint64.ilproj index d7b27d340832bd..c20b1dd2e215b8 100644 --- a/src/tests/JIT/Directed/zeroinit/init_uint64.ilproj +++ b/src/tests/JIT/Directed/zeroinit/init_uint64.ilproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Directed/zeroinit/tail.il b/src/tests/JIT/Directed/zeroinit/tail.il index df7547e6a43571..7b23b5c0eceb0c 100644 --- a/src/tests/JIT/Directed/zeroinit/tail.il +++ b/src/tests/JIT/Directed/zeroinit/tail.il @@ -8,8 +8,8 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly tail { } -.class private auto ansi beforefieldinit AA +.assembly 'tail_zeroinit' { } +.class public auto ansi beforefieldinit AA extends [mscorlib]System.Object { .method private hidebysig static void Callee1(int64& B) cil managed @@ -64,8 +64,7 @@ jmp int64 AA::Callee2() } // end of method AA::Caller2 - .method private hidebysig static int32 - Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Directed/zeroinit/tail.ilproj b/src/tests/JIT/Directed/zeroinit/tail_zeroinit.ilproj similarity index 75% rename from src/tests/JIT/Directed/zeroinit/tail.ilproj rename to src/tests/JIT/Directed/zeroinit/tail_zeroinit.ilproj index c552ec1d37ddb7..ebc05eb839f3ce 100644 --- a/src/tests/JIT/Directed/zeroinit/tail.ilproj +++ b/src/tests/JIT/Directed/zeroinit/tail_zeroinit.ilproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/Loader/classloader/Casting/punning.cs b/src/tests/Loader/classloader/Casting/punning.cs index 3971a781578b73..01064d2f268229 100644 --- a/src/tests/Loader/classloader/Casting/punning.cs +++ b/src/tests/Loader/classloader/Casting/punning.cs @@ -9,7 +9,7 @@ partial class Program { [Fact] - static void Via_GetFunctionPointer() + internal static void Via_GetFunctionPointer() { Console.WriteLine($"Running {nameof(Via_GetFunctionPointer)}..."); @@ -24,7 +24,7 @@ static void Via_GetFunctionPointer() } [Fact] - static void Via_GetFunctionPointer_Generics() + internal static void Via_GetFunctionPointer_Generics() { Console.WriteLine($"Running {nameof(Via_GetFunctionPointer_Generics)}..."); @@ -39,7 +39,7 @@ static void Via_GetFunctionPointer_Generics() } [Fact] - static void Via_Ldftn() + internal static void Via_Ldftn() { Console.WriteLine($"Running {nameof(Via_Ldftn)}..."); @@ -54,7 +54,7 @@ static void Via_Ldftn() } [Fact] - static void Via_Ldftn_Generics() + internal static void Via_Ldftn_Generics() { Console.WriteLine($"Running {nameof(Via_Ldftn_Generics)}..."); @@ -69,7 +69,7 @@ static void Via_Ldftn_Generics() } [Fact] - static void Via_Ldftn_Generics_Virtual() + internal static void Via_Ldftn_Generics_Virtual() { Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual)}..."); @@ -85,7 +85,7 @@ static void Via_Ldftn_Generics_Virtual() } [Fact] - static void Via_Ldftn_Generics_EarlyLoad() + internal static void Via_Ldftn_Generics_EarlyLoad() { Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_EarlyLoad)}..."); @@ -100,7 +100,7 @@ static void Via_Ldftn_Generics_EarlyLoad() } [Fact] - static void Via_Ldftn_Generics_Virtual_EarlyLoad() + internal static void Via_Ldftn_Generics_Virtual_EarlyLoad() { Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual_EarlyLoad)}..."); @@ -116,7 +116,7 @@ static void Via_Ldftn_Generics_Virtual_EarlyLoad() } [Fact] - static void Via_Ldvirtftn() + internal static void Via_Ldvirtftn() { Console.WriteLine($"Running {nameof(Via_Ldvirtftn)}..."); @@ -132,7 +132,7 @@ static void Via_Ldvirtftn() } [Fact] - static void Via_Ldvirtftn_Generics() + internal static void Via_Ldvirtftn_Generics() { Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics)}..."); @@ -148,7 +148,7 @@ static void Via_Ldvirtftn_Generics() } [Fact] - static void Via_Ldvirtftn_Generics_EarlyLoad() + internal static void Via_Ldvirtftn_Generics_EarlyLoad() { Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics_EarlyLoad)}..."); diff --git a/src/tests/issues.targets b/src/tests/issues.targets index d0e374bf4992de..bbfb9e2b6dc383 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -70,7 +70,7 @@ - + https://github.com/dotnet/runtime/issues/10478 @@ -347,7 +347,7 @@ https://github.com/dotnet/runtime/issues/12979 - + https://github.com/dotnet/runtime/issues/12979 @@ -440,7 +440,7 @@ https://github.com/dotnet/runtime/issues/12979 - + https://github.com/dotnet/runtime/issues/12979 @@ -491,7 +491,7 @@ https://github.com/dotnet/runtime/issues/12979 - + https://github.com/dotnet/runtime/issues/12979 @@ -1078,7 +1078,7 @@ https://github.com/dotnet/runtimelab/issues/182 - + https://github.com/dotnet/runtimelab/issues/155: Varargs @@ -1450,9 +1450,6 @@ Mono does not define out of range fp to int conversions - - Mono doesn't have a dynamic pgo or tiered compilation infrastructure - https://github.com/dotnet/runtime/issues/46174