diff --git a/src/tests/JIT/Directed/Arrays/Complex1.csproj b/src/tests/JIT/Directed/Arrays/Complex1.csproj index 92d196ae4184d..55952fd1ae229 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 9a249fbca6f18..9713580ab74a3 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 ccc5e45c6e4c6..ee52e6e66026b 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 c8c892477bb41..38146029bf030 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 3d64fba3ea5cf..40623214b60d3 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 c60878bc8c128..3edbbb8ed3e67 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 bc1890a3be38a..a8cdadc7adc6e 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 be7bb82adc72d..d7bf34724055e 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) + internal 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 bbfe3b0eda59d..c4d90132af9e1 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 78d2d2e26fe19..9f04295a11af1 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 973f557883f46..23dc05ce1646f 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 6143f0fefaee9..5f215bf2ddaf3 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 7032d58d21606..fc6fcb587c0f8 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 5d8fe22529764..377bf381b5286 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 6c7dcad73d7f0..6ab1e984f7d82 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 959088b8b98fd..a2a83758312e1 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 83ee8123e8926..dd7e97f17c173 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 359497ed1a7df..6a3bfbcc32fcc 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 75b364c010523..d9c9f7ab700b2 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 2b6bcca24d0ba..a96a30cdb04bf 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 e3815c0ae9076..eae7350d05d8a 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 04795c41f06be..955b40c264117 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 89b5d0e5ec1f5..ca76d19617ad5 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 78b665067e091..e1be49cba5fb2 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 beb90471ec6f1..a883dc9b7a7ce 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 7dff9a8d82266..046b3072713ed 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 f23fe7ccb1695..315d62f9cd8de 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 b80d2c64fd2f8..d930d15c2aa95 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 4fe5996d4b5bf..aa2a7b9734256 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 513ca0593376b..6fa2528ad6d21 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 15321544d7e6e..31767923b18f4 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 769ecc3abed1e..96e5e16657386 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 9f4cc5318734c..c3dea573bfa6e 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 4af79c9a7c6a1..30de2ab797e96 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 2a03d1e85763e..0e065ddc8670b 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 3ab33a5c8e245..4d6c3e1964c37 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 aff5f4d37d302..90b85f2ea430b 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 e0871a5fdd757..3e84006487986 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 db5a58b02fe6c..7b1335f09cd7f 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 5a3b0a48d52ee..42d3543841dcf 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 bd154a365e89e..6d9a23a88b3cf 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 eb87fa4a75fea..43c2a1c7e586f 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 c8ad7a2c110ed..09d7c487a8a83 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 e4c325ae19c37..a6c4a64b3cf88 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 b439c477c0cf9..1b7c8f1783fd0 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 958b27fff6846..a120052391aaf 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 c8147b555a1e4..841bcfa3b427e 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 ee7187b5f3604..6bcd5ee907c5a 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 881583cad3cad..f0e3db400a554 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 c6718027bb18d..6fc22dfd63de3 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 17c1d4c8ae30e..87de6c8976e2b 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 bcaa593ba8113..0d771280a81bb 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 87b1c54538338..ea45f7237e0f1 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 edc51be9ca25b..a09146632664b 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 d0b312fa28d68..188e27ffb8e1a 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 52f98839e8d7c..7073b77f48c70 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 f5baa6e657a86..b6ebd0ea1d9d2 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 8cce6c7e514c0..944d8869a9fca 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 b7d9b10ca6b35..eb4e64bd9b090 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 a01486d00ba37..4591cd0171c3a 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 2b1476d73fb8c..0851ad430274a 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 70b4d1853419c..28cc0cda16f0a 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 574aa4407fab2..33304105684cf 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 e7c67cc80e853..4b3a54c1abb8a 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 97162313dd030..2bdf9fcfb01aa 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 676d8a4c1a526..82d04dd1a47ea 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 954fda640816c..5b78783c09e4c 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 4fdc04dc7e690..15e584299a6a7 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 9b4ce90ddb9a6..72ec4ce245645 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 a6b9c39562133..324e723653c83 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 db5edfc2dd080..6b3c310a24ce8 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 75129bf3386fc..1b47316d94e53 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_1.csproj b/src/tests/JIT/Directed/Directed_1.csproj new file mode 100644 index 0000000000000..162981e81d74a --- /dev/null +++ b/src/tests/JIT/Directed/Directed_1.csproj @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/Directed_2.csproj b/src/tests/JIT/Directed/Directed_2.csproj new file mode 100644 index 0000000000000..1283dc887da9f --- /dev/null +++ b/src/tests/JIT/Directed/Directed_2.csproj @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file 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 0000000000000..ef6a9dc243782 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_cs_r.csproj @@ -0,0 +1,7 @@ + + + + + + + \ 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 0000000000000..e8a582013ee3f --- /dev/null +++ b/src/tests/JIT/Directed/Directed_cs_ro.csproj @@ -0,0 +1,7 @@ + + + + + + + \ 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 0000000000000..9137c936b6b3e --- /dev/null +++ b/src/tests/JIT/Directed/Directed_d.csproj @@ -0,0 +1,7 @@ + + + + + + + \ 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 0000000000000..87aa58202d18c --- /dev/null +++ b/src/tests/JIT/Directed/Directed_do.csproj @@ -0,0 +1,7 @@ + + + + + + + \ 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 0000000000000..b68cb8478ab2a --- /dev/null +++ b/src/tests/JIT/Directed/Directed_r.csproj @@ -0,0 +1,8 @@ + + + + + + + + \ 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 0000000000000..4b0cfad60a365 --- /dev/null +++ b/src/tests/JIT/Directed/Directed_ro.csproj @@ -0,0 +1,8 @@ + + + + + + + + \ 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 0000000000000..3d7aacef4e4fb --- /dev/null +++ b/src/tests/JIT/Directed/Directory.Build.props @@ -0,0 +1,17 @@ + + + + + false + + $(MSBuildProjectName.Replace('_il_d', '').Replace('_il_r', '')) + + + + + + true + + false + + diff --git a/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.il b/src/tests/JIT/Directed/ExcepFilters/excepobj/excepobj.il index d3d9e18e759b5..458ea4b72fb10 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 bcaa593ba8113..0d771280a81bb 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 3263e6695605f..555332e0b3da1 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 bcaa593ba8113..0d771280a81bb 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 34e58fb0da784..a994f6cc2b298 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 972c31a9a80dd..7c7ed9f1abff7 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 35e1e802e651a..8fd65dd0e64b7 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 2969b18f1d9cb..da350f6a897c8 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 99eb683291090..f57f6713ee837 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 972c31a9a80dd..7c7ed9f1abff7 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 816dae2effc37..7eb156d566fbc 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 972c31a9a80dd..7c7ed9f1abff7 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 index 042bf2d4b981b..dfa53c50eba69 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 c2da6c5e693a5..3c5d267b8d0df 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 4bae8769b81da..75d1bdfc918f8 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 cbbdb9678024c..54cd350fbaeac 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 index fc2c768287e27..bf382226d695f 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 603fc1a8e34d0..ed432ead914bd 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 c645cb7b1de12..f35b8706508a3 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 433ae2d8efb7f..d48c3bde42a01 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 b229bce6798c1..fa335b3ae8add 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 index af932cbed491c..f33a6eb678269 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 57fcd448e92bd..143989027858f 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 index bdbb31f28da8a..0c50cbaad4b83 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 84e8423fbd0b2..237d3d3d27883 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 4a0d81e672ebc..96801e491af7b 100644 --- a/src/tests/JIT/Directed/IL/leave/leave2.il +++ b/src/tests/JIT/Directed/IL/leave/leave2.il @@ -3,12 +3,13 @@ .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 +56,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 +134,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 +199,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 e16180a1c2cf6..9cd16a641da2e 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 8502424557aa4..0d8b49e9c72fd 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 index 2c55ebe774f24..d5387f9b97c0d 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 index 29892fc353dfd..674ee3de73e44 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 4c428ac7884b8..7ee26fc2a5d8d 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 39067167cff20..eaf57b0af1c5d 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 6ff72bc01a9ce..0eae0195c1e6f 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 @@ -121,7 +122,7 @@ public S1 Method60(ref decimal p_decimal_1639, out float p_float_1640, ref byte } } - public void Method0() + internal void Method0() { unchecked { @@ -134,9 +135,10 @@ public void Method0() return; } } - public static int Main() + [Fact] + public static int TestEntryPoint() { new TestClass_Loops().Method0(); return 100; } -} \ No newline at end of file +} diff --git a/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.csproj b/src/tests/JIT/Directed/LoopAlignment/LoopsToProcess.csproj index 41982afaf9353..3b4963e22a3b6 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 28e3f9b0019b2..9b572b075b8ca 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 4075ae90a4d1c..35b03986da647 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 752d06d9b06a9..453ed0c7160b9 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 4003e50eb8537..d6e3fb1f60de6 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 c7973e333e116..896a726ce3c3a 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 9e79e7c47f50c..757a497684ca7 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 fa0447a72abca..fb024ed52703f 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 0294f4b6e7b2f..91932cdf3bb88 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 4e690b43e50f1..261af2d86d47b 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 324abf6be0f32..6647ba94cd6d7 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 5b8840cdc149e..c0138ddb544eb 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 bdac40ad1e45a..9f52ab6b1eb84 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 29f82fd0fe82d..3e06a851305e7 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 f20ce9fcbaa1d..931f7c23e8394 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 760b39c31a7d4..dea40e33ac75f 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 461df3d2eb36d..96678ca134c6b 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 954c82f3ec78e..acf9ac5bf3f80 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 85dbb4cb0f07e..ade8bffa66e19 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 e80794754bfaf..8503b4d1797b5 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 7c689f59cd2bc..dbf820322d445 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 af07a8a4bbb8e..ebb48ab4886a8 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 8ec9cdec5f7b8..a7a7639762dea 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 0ab8c195cbdd2..22c778da89cba 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/4/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/4/Box_Unbox.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/Box_Unbox_unaligned_1.ilproj index 36090515c8407..5661ca9880ac0 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 4d3552d7d9b4c..c0cb68635b652 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_Desktop_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/Desktop/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add_Desktop_unaligned_1.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add_Desktop_unaligned_1.ilproj index 29d61f567663a..1cc2edaa94867 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add_Desktop_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 4d3552d7d9b4c..e4d54f005e573 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_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/1/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/1/add_unaligned_1.ilproj similarity index 88% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/add_unaligned_1.ilproj index 613bfa9cc2803..5d4f6409840be 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/add_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 99ddad161eb97..cbffec7b46952 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 74ad14baf0e67..c0887440fa812 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 055e6f6f78fcd..4abdaa3bde679 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 f06b170c80bf4..234ed1f8c99c6 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/2/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/2/arglist_Target_64BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_64BIT_unaligned_1.ilproj index 3a7d1c3e60d5f..4aa377bfa4bd7 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 ca3158bf90969..5c540429673da 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 ae4207e98ae4a..65d1f9a3ff7d5 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/2/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/2/array_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/array_tests_unaligned_1.ilproj index 7e6a250b1c945..c9af748f93966 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 94308a920cebb..f04bb734a79e1 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/1/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/1/cpblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/cpblk_unaligned_1.ilproj index 8ce6bd8ab4bd2..b0e4d46a05a00 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/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 47b11cbaf05e6..99f35261127eb 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 8fc711dc37288..727294b29541f 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 3b5d1d8cd96e6..3144aebd80146 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/2/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/2/field_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/field_tests_unaligned_1.ilproj index 247deb1713b8f..c680de401a6f3 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 d68cf63e76e11..46449ba9ed813 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/2/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/2/fielda_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/fielda_tests_unaligned_1.ilproj index e1579dff3319e..96e2ac4fe559a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 b3b4333f9c8da..e7d5d713b759f 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/2/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/2/initblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/initblk_unaligned_1.ilproj index 1da6a535ce437..25dd726606808 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 859c86f0b7f0a..4437665e33c01 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/2/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/2/initobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/initobj_unaligned_1.ilproj index 7544fb3b1fb88..b1b03b850211c 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 e0ba4bfbd9c22..c8310fed6e118 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/2/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/2/ldind_stind.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind_unaligned_1.ilproj index 19cd8c05742cc..936d1950d9814 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 1f56a8e033b41..57ebf0c33926e 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/2/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/2/ldloca.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/1/ldloca_unaligned_1.ilproj index 0da9e74569c4b..ae5706984cea9 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 298974dfa9a73..60812eced46ea 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 f3cf514f67c3d..4187891a7fb2b 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 d7f667a19f0ac..450290d47b2af 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 4259991549266..ddd12ec0ef756 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 bc487c31c2d10..6c693f909282b 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 36090515c8407..5661ca9880ac0 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 a6131d642f4b7..5d5c5116c7b9f 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_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/volatile/1/Desktop/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/2/add_unaligned_2.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/add_unaligned_2.ilproj index 29d61f567663a..1cc2edaa94867 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/add_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 9fc3983440984..a00ecb121b076 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 751f86b0e53a2..130394f0e13f2 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 f3eed6072f9cd..f4de71c51cb09 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 f06b170c80bf4..234ed1f8c99c6 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/4/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/4/arglist_Target_64BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_64BIT_unaligned_2.ilproj index 3a7d1c3e60d5f..4aa377bfa4bd7 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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/2/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/2/arglist_Target_ARM.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_ARM_unaligned_2.ilproj index ca3158bf90969..5c540429673da 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 8f3399465bd44..e042124ed36e1 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/4/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/4/array_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/array_tests_unaligned_2.ilproj index 7e6a250b1c945..c9af748f93966 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 aa36ebc7218ea..2524997640c27 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 8ce6bd8ab4bd2..b0e4d46a05a00 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 11843a00d643c..4164e339e023d 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 d3813e1eb721d..d44aaf40e7c84 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 3859bc8469b60..195e15a60fcaf 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/4/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/4/field_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/field_tests_unaligned_2.ilproj index 247deb1713b8f..c680de401a6f3 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 b8258e9b2d49b..5fbeae2c05010 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/4/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/4/fielda_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/fielda_tests_unaligned_2.ilproj index e1579dff3319e..96e2ac4fe559a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 f7db4449c00fc..1438a3d52dc97 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/4/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/4/initblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/2/initblk_unaligned_2.ilproj index 1da6a535ce437..25dd726606808 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 28117f68b687c..1234755626d72 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 7544fb3b1fb88..b1b03b850211c 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 02730af357abf..8a3f12410b2c7 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 19cd8c05742cc..936d1950d9814 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 2a6db18fd7c5a..6e74b2f43dce7 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 0da9e74569c4b..ae5706984cea9 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 347d49175190a..7c1958bf1df5d 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 974849723d39a..4664a2152d53e 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 ea96334ef8917..6a4136d0854b7 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 795dd9e991bf0..d236da35b50cd 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 d067c4ae5bd1c..8329ae7a4c2cf 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/volatile/1/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/volatile/1/Box_Unbox.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/Box_Unbox_unaligned_4.ilproj index 36090515c8407..5661ca9880ac0 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/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 f7a19abba1b9e..409f3f6eb0556 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_Desktop_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/1/Desktop/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add_Desktop_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add_Desktop_unaligned_4.ilproj index 29d61f567663a..1cc2edaa94867 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/Desktop/add_Desktop_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 629d0dd64c349..fa7120ce1743e 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_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/4/add.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/add_unaligned_4.ilproj similarity index 88% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/add.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/add_unaligned_4.ilproj index 613bfa9cc2803..5d4f6409840be 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/add_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 f7cb305d9d707..ff45fbb28b4bf 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 635623f76a71d..4c00cd2853696 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 85626d71e7cd0..abc1509bfa091 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/volatile/1/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/volatile/1/arglist_Target_32BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_32BIT_unaligned_4.ilproj index f06b170c80bf4..234ed1f8c99c6 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/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/volatile/1/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/volatile/1/arglist_Target_64BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_64BIT_unaligned_4.ilproj index 3a7d1c3e60d5f..4aa377bfa4bd7 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/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/unaligned/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/unaligned/1/arglist_Target_ARM.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/arglist_Target_ARM_unaligned_4.ilproj index ca3158bf90969..5c540429673da 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/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 13c790538e486..806d2df67fe09 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 7e6a250b1c945..c9af748f93966 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 32ddf2dab432a..afae2ebe1f92e 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/4/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/4/cpblk.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/cpblk_unaligned_4.ilproj index 8ce6bd8ab4bd2..b0e4d46a05a00 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 411dd5a7b5b43..08605e9fadde8 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 8fc711dc37288..727294b29541f 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 eb9a3de78046e..29d6d27d03d32 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 247deb1713b8f..c680de401a6f3 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 9a65fc39bdfd5..e1b58fa07cd14 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 e1579dff3319e..96e2ac4fe559a 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 7be33fa18815a..31f420ef839b9 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 1da6a535ce437..25dd726606808 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 8f7c37aaf572c..48d5b686707b5 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/unaligned/4/initobj.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/initobj_unaligned_4.ilproj index 7544fb3b1fb88..b1b03b850211c 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 fafc36d667b26..45321d335b2e1 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/unaligned/4/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/unaligned/4/ldind_stind.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind_unaligned_4.ilproj index 19cd8c05742cc..936d1950d9814 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 c2466b1014354..a2a4bd09aba5f 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/unaligned/4/ldloca.ilproj b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca_unaligned_4.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj rename to src/tests/JIT/Directed/PREFIX/unaligned/4/ldloca_unaligned_4.ilproj index 0da9e74569c4b..ae5706984cea9 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/4/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 bb660619e0d73..3c87075e26bf6 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 f3cf514f67c3d..4187891a7fb2b 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 2ffdfc1a6d4ae..ab5f5a5b65300 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 4259991549266..ddd12ec0ef756 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 3af610b476b46..c6931c3ccd285 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/unaligned/2/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/unaligned/2/Box_Unbox.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/Box_Unbox_volatile.ilproj index 36090515c8407..5661ca9880ac0 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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 028f31b07eeea..af469a892840d 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_Desktop_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/unaligned/2/add.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add_Desktop_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/2/add.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add_Desktop_volatile.ilproj index 29d61f567663a..1cc2edaa94867 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/Desktop/add_Desktop_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 028f31b07eeea..905d7687bb3eb 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_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_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_volatile.ilproj index 45a9536676091..3871e24f9ac8e 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/add.ilproj +++ b/src/tests/JIT/Directed/PREFIX/volatile/1/add_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 782151eb003ee..773704844d4bc 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 5a5b3517aa019..7dc1e828e7465 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 cd9e5017aa84f..a556125c58c5d 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/unaligned/2/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/unaligned/2/arglist_Target_32BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_32BIT_volatile.ilproj index f06b170c80bf4..234ed1f8c99c6 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/2/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/unaligned/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/unaligned/1/arglist_Target_64BIT.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_64BIT_volatile.ilproj index 3a7d1c3e60d5f..4aa377bfa4bd7 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/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/volatile/1/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/volatile/1/arglist_Target_ARM.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/arglist_Target_ARM_volatile.ilproj index ca3158bf90969..5c540429673da 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/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 66e21a18c52dd..8dffcf4ebb9e3 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 7e6a250b1c945..c9af748f93966 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 cd2dba0abab9e..525d26d7db97c 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 91662a7326991..ea0bdf9f44838 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 3a6b1de45de92..b0736fdd4363a 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 8fc711dc37288..727294b29541f 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 9970be1a45c96..2450abc7f67df 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/1/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/1/field_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/field_tests_volatile.ilproj index 247deb1713b8f..c680de401a6f3 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/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 ee50234b1d435..6ec839b2a2758 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/1/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/1/fielda_tests.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/fielda_tests_volatile.ilproj index e1579dff3319e..96e2ac4fe559a 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/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 81375b57d2238..d6794e878d3b5 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/1/initblk.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/initblk_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/initblk_volatile.ilproj index 1da6a535ce437..25dd726606808 100644 --- a/src/tests/JIT/Directed/PREFIX/unaligned/1/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 29d5f58140651..2d09c1a601da8 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/volatile/1/initobj.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/initobj_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/initobj.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/initobj_volatile.ilproj index 7544fb3b1fb88..b1b03b850211c 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/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 1a2933e688a89..1b2d0720f6d90 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/volatile/1/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/volatile/1/ldind_stind.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind_volatile.ilproj index 19cd8c05742cc..936d1950d9814 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/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 ceab5c388459f..9919798bbe72f 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/volatile/1/ldloca.ilproj b/src/tests/JIT/Directed/PREFIX/volatile/1/ldloca_volatile.ilproj similarity index 89% rename from src/tests/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj rename to src/tests/JIT/Directed/PREFIX/volatile/1/ldloca_volatile.ilproj index 0da9e74569c4b..ae5706984cea9 100644 --- a/src/tests/JIT/Directed/PREFIX/volatile/1/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 7b80b49ec9a33..5e93fbd22badc 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 f3cf514f67c3d..4187891a7fb2b 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 7e67871a7ccd6..d5be7d217326d 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 4259991549266..ddd12ec0ef756 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 29745f7bd2a54..bbfb190c51e85 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 d2d994f7fe57d..d7eb61a02264a 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 69938be6c447b..3237683afcdaa 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 660f2bcbdfa62..dc1f0debc4d90 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 5dfa46e7bb5c8..08e4dfd4444f3 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 8c04d8da0ed1f..c608160862768 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 29566cb0969ce..d2c1ad108348a 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 19463e014307f..fb973032e70f9 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 d83610048f49c..c45d0b91638f2 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 07d30446ab94e..9e79915b42d96 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 6e342e6eb933b..9511d04b315cb 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 53a97830a9ff8..d1199f8c45fe7 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 ff6412c495a2b..e00db5913c120 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 bae1a82f57d04..adc7bfe425a16 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 340b69c52b191..bb04da7db452d 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 d45537daa2421..8287a22261f4f 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 7d451be82a759..973c41aef908e 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 163526742a61c..ebb40a0881822 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 77f6eaf9fb880..1ea6f167e461d 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 7e09b78ff5bd0..925f622d0e1d9 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 9cb75e8e91a61..0d71331cb6901 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 52c595c0e0813..175d25324e6b4 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 b19b470875748..644fd13f9d85a 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 52c4d32ecc575..3fbd8d6ebd962 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 30f1e4c6fb832..117810d8e4e62 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 3488df63056fd..d71677789c35f 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 6b1770a12a508..52615fda89216 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 66a19bb8cb42d..509ee2c438b94 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 52c4d32ecc575..0000000000000 --- 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 d427ffca5f69b..0000000000000 --- 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 1872ca38d7e62..19417aec54b1f 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 6d06d331a2a59..8b5eb67f78c56 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 3fb55a909960f..54e63fbf8c746 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 de62e29fa3e18..47508bb49d57b 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 6cd2367b32728..1b3ec490a9ed4 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 de62e29fa3e18..47508bb49d57b 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 b8924b99bc417..0f4d38f867487 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 9d281a449d071..53268712f72b8 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 cba7bae7377f9..2f74d49e75853 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 f56c320ec48d4..4a7b9d274aa4e 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 d37600f1b1ff8..ee8d8174d1239 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 404058b0736fe..044f050294082 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 ceb0bdc6736b0..3933d03a5b8ce 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 de62e29fa3e18..47508bb49d57b 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 b22100b7a0e29..06542e0eadd52 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 ac7d36843199b..5b431daed2952 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 ab5cb4d8b0674..ed3455999708e 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 16704453f35f4..6968ce2bd86ea 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 5e53f9c993f60..a6fd7d9bf157f 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 65be5229e25eb..7183fe04dc241 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 5d8fe22529764..377bf381b5286 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 ac8098b75ce97..ba06f3dc293f1 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 ea6a8f2d28c1e..e8759697bca9b 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 5cd40d988f767..62bf12e7b4e87 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 b3f734ac70df9..d458d2e50a43e 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 89f2227b101f0..adea9bf87375a 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 44b5b7e3c9eed..ae46b7e6cc3ca 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 0d9bcc91de668..ba6ba924a9720 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 0ba34ad78473a..a3c743048d377 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 1b833128c1724..c6513507115fe 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 de084fec44a8c..58c2a081e5479 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 ff357aed5c2df..4e5e51f86fd86 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 47db151e662a6..c307326963f98 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 afe96038b705d..e9d49ee9faae0 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 8ba11c61cc3d2..e4b9e0aacf208 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 d0189d8581a53..5d49aecac3ccb 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 89e5304fb7c77..a3aa67b5dc215 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 16126f7716d58..263f6001100eb 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 221dbf44a6c25..1ba999d089f70 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 253f96dfa09bf..394eaa0982081 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 0e0deab0f1c69..46482d30cd57f 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 4987b2c2237c7..b9fa68710da73 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 25b01591fe6bd..be62fa8811f16 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 7f4957fc7f265..b816fb3579762 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 dc5ebf0336d1f..7228331b29aed 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 6b6b891160cf1..5bd09ab4d4a9e 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 f3e1cbd44b404..501217e4d8689 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 e9050b1452e86..fc1fef767741a 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 { @@ -44,7 +45,7 @@ public struct Data [MethodImpl(MethodImplOptions.NoInlining)] - public static void TestDoubleAssignment(Data d) + internal static void TestDoubleAssignment(Data d) { Dec p = default; p.ulo = d.x; @@ -70,7 +71,7 @@ private struct DecCalc2 } [MethodImpl(MethodImplOptions.NoInlining)] - public static void TestIntAssignment(Data d) + internal static void TestIntAssignment(Data d) { Dec p = default; p.ulo = d.x; @@ -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 f3e1cbd44b404..501217e4d8689 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 0e7c23fa1bf29..a04a9b75b3e81 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 f3e1cbd44b404..501217e4d8689 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 a6c1a3832fd6f..8b7c64445bea0 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 fe4a2822d7cab..4ee2e5892f225 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 e44f57a3d12ba..5376264c695b1 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 a31be34ec1822..2463d7be95074 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 7f84ec4c72f7f..a7f42c31c5436 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 5536117c44a4c..8edb3e1b7ea67 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 325cd9be94493..d2fa0a6e8ba03 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 c97a7ce9d57f4..b46e82ce00a25 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 27b17ab5845ba..1774292cb5b39 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 b60bdf9bcb1c3..90cb1e4fccf6e 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 b295f7b4815d0..fc582df82089c 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 f258008057a15..fcbd88786363b 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 76aa741e3579a..4f533cb7c617c 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 754aa873d5b72..74e289f51ee7d 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 aa87f9ccf78cb..38a11bb2ff1da 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 8e43b14392c1f..10b22dd22d59e 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 9c51d20c25951..6b39bbacbfb35 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 8010ca348d27b..311a8bb459c18 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 8ca2ea1677e74..b2e2b4bcf2091 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 c48ce253d8e26..ba4c262809cc0 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 38648d1f9adb2..cd5a508bf1172 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 457524ffa86b5..eb593923acc21 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 4380e0934dcf4..6f77c44f40f76 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; @@ -16,7 +17,7 @@ internal class loop6 public static double sdelta; public static double stemp; - public static void f1() + internal static void f1() { float one = 1.0F; double delta = 1.0D; @@ -35,7 +36,7 @@ public static void f1() System.Console.WriteLine("f1 failed"); } - public static void f2() + internal static void f2() { float one = 1.0F; double delta = 1.0D; @@ -54,7 +55,7 @@ public static void f2() System.Console.WriteLine("f2 failed"); } - public static void f3() + internal static void f3() { double temp = 0.0D; float one = 1.0F; @@ -73,7 +74,7 @@ public static void f3() System.Console.WriteLine("f3 failed"); } - public static void f4() + internal static void f4() { float one = 1.0F; double delta = 1.0D; @@ -93,7 +94,7 @@ public static void f4() System.Console.WriteLine("f4 failed"); } - public static void f5() + internal static void f5() { sone = 1.0F; sdelta = 1.0D; @@ -111,7 +112,7 @@ public static void f5() else System.Console.WriteLine("f5 failed"); } - public static void f6() + internal static void f6() { VT vt; vt.one = 1.0F; @@ -131,7 +132,7 @@ public static void f6() System.Console.WriteLine("f6 failed"); } - public static void f7() + internal static void f7() { float one = 1.0F; double delta = 1.0D; @@ -151,7 +152,7 @@ public static void f7() System.Console.WriteLine("f7 failed"); } - public static void f8() + internal static void f8() { float one = 1.0F; double delta = 1.0D; @@ -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 0e332ebe215ff..fc4ceaca901b3 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 3b9871b4378e9..9aad896c7e227 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 c736c4607917d..604155bfab621 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 67116f8c3072f..01df7f52e2829 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 2f4a01243ca00..d6e9f48943ed3 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 7d42576deb4d3..517b875bdb2e6 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 0cdf279fdb2ec..34fd1286e5e91 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 fb8fa457bab1d..fed23a9601413 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 8db2ec9bcfff9..7a4011ddc2d0d 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 77818c1cc9aec..30413af3755ac 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 cab90a1a1fd88..bad61ff7d4dd0 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 5e2c2b9f5ccdb..e7d8df2d7d81a 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 cf5c3f7cca744..e242197187422 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 7374aed3e463d..a31b9f0e09799 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 3cf2777cc643d..14ea5a581c9ee 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 1292f6a161dcd..727b6eea8bf41 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_TargetUnix.csproj index 3184bc6377d1e..e092d9efcae8a 100644 --- a/src/tests/JIT/Directed/arglist/vararg_TargetUnix.csproj +++ b/src/tests/JIT/Directed/arglist/vararg_TargetUnix.csproj @@ -1,6 +1,7 @@ - Exe + + true true true diff --git a/src/tests/JIT/Directed/arglist/vararg_TargetWindows.csproj b/src/tests/JIT/Directed/arglist/vararg_TargetWindows.csproj index b3a74e3c4022b..63e9ac588fb0e 100644 --- a/src/tests/JIT/Directed/arglist/vararg_TargetWindows.csproj +++ b/src/tests/JIT/Directed/arglist/vararg_TargetWindows.csproj @@ -1,6 +1,7 @@ - Exe + + true true $(DefineConstants);WIN32 diff --git a/src/tests/JIT/Directed/array-il/_Arrayscomplex3.ilproj b/src/tests/JIT/Directed/array-il/_Arrayscomplex3.ilproj index 7fe18ed151688..aafce5d8bd7fc 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 05b63128367c8..3a1abad04f6cc 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 efaf0fcade1b5..1e30429f93ef5 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 2696dd5bcb0d9..3a8b5d3227295 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 cd778e1756b87..e1007c544290a 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 6c5290aa511b5..00eaa467d6d71 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 9a029e58deb9c..c857a5a6dca42 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 6c5290aa511b5..00eaa467d6d71 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 48fd229c66e38..a2efa453a78b5 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 6c5290aa511b5..00eaa467d6d71 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 dc24a4ed76f38..835c300c86265 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 5bfd93deb062e..38f044d738e46 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 04c87e1ea2d13..f69bc693d9b3f 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 5bfd93deb062e..38f044d738e46 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 9cb09a09127d9..3052e13e62a48 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 af5be141a9527..a5f6477d38dba 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 c5ae67f62f29c..3e46d2c0cdcc5 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 1d2e5407ce721..6ed9a17ddebf0 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 dbe95367546a6..264f70be0cd6c 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 13ec2dfb7e510..7850d34aa2514 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 ad1b9db1b1a1a..2141a43d9c973 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 91edbb202c72f..b774f6104d49e 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 bcbe9c14869f3..fa9099a0f7295 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 9cd020d12723f..649ac0e078c85 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 66822717a5c2e..ad4f2eed1f5f1 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 4c5702a2f6e0b..977a54a1c5fa7 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 e59d12f08e605..40997ab6cef48 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 1b878581b7720..2c51752626eb9 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 b46c59cd677c0..d7de7118a90aa 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 c9a1c5f9a870c..7fc44dc60af1f 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 ba950f2809c42..47cc57cb6f234 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 9eb33d71596e9..3ea2e730222c3 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 d4ed3b89f9468..174c12293614c 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 9e4b02fdb7d6c..7b1f0cd772881 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 f9f2c48c44fb0..6f6ef4ee08ea4 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 5457c68a5dd69..9b275006c89e7 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 58a30e9c1e59a..2d5e79e90896b 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 3d991aeb5ed78..5c7c3d39297d4 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 974639545dc2a..4399e30c012bd 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 7b36c8265a330..8fbf122a74e67 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 cf4967b13b039..1a886c28e41d7 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 f85cb2cbf83ef..49d70f7b7b1d8 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 c15eaac5d362f..f659ba5f3b439 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 f49e87c279366..d0e9d9c5b4e9c 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 a70731d643228..abd89b1daef63 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 58ec62545a1c8..e58f0dd964f4c 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 0b4d317d93f78..911dcaeae3e26 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 3567437b4d9b3..22c0adc63111a 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 d881a0ea8dd7f..2eebe37b0365e 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 3d904e8bf321c..e12c6a33a6fa6 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 99e474237d0fd..0d0a66413aab4 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 859d8f7279865..4bb02a74f0f5b 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 0b145dbd8bf6c..90cdeab3c2874 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 6a6d81721a726..19dab70aafb8e 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 b98a9eca55556..d38634551dc25 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 8e84995e644f6..5223788b048dc 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 487a44b39a2b2..c41e7954b4b61 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 0c08fc9590c60..23024ecbc8d0e 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 cc70a7ad64c95..f559d66cc57b1 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 5c720ea5563d5..fe9b4709d0634 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 cb18222dc74d8..74ddd0c9d8b2f 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 67fea06ba7d99..f38fd223f7582 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 b5d42a7adfdaa..12d97265102ac 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 487adf7ce7248..81aad80e17a6c 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 19400d77f7331..3d61a6bb15f0a 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 df209c097af6f..c7bb63f9f7f4a 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 377dc991d3cc1..ebc5bb5784613 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 5255a35f3fe5a..525a59c22a9ad 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 6dd61b285ba14..878eee1f8daeb 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 b375ee9b6dc5f..5f7638918ba5e 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 2a7897784a48c..8151f8a152395 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 4a3d3f9f38f06..095eef676db52 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 5e9855f291804..48786e7586fbf 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 60d20c7d85543..eee3a3ca9b6f8 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 736730378bbd9..4914efca4031f 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 4ef555c88be59..9a2e447d9fba8 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 3ee5da6ccac77..b862798a71cc3 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 e05c665af4ff7..a69d13c3e8b9f 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 325cc2277a980..96a402a70b3c0 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 b0b15823f5127..bc829fc2400e4 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 6428a45f87d0d..d79dd1fa9d424 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 0ec8f8dcc091b..20a7884388807 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 759a1bfb7bdd5..08724e921cead 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 c7c89fd8c4bd2..1c3c2d0d45dea 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 2f1e9fcd025b9..c49f6028124ef 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 16adaa8f14293..599b6160215a2 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 3542cd056a9ba..ec54149065d86 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 8d039df169718..79c55e9416ca6 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 406bdc67c47bb..6501523083a3d 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 f8444ec26bc67..9e74439330eae 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 7a03403d6fb4b..26ff4acbcdf73 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 b642dc770fe7d..d4ad4fbfcba69 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 5fa40f71a1799..ae99354d2c5e3 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 4ee5cd90199bf..339467ccd42d9 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 9034e93113b5d..0175d39a833c4 100644 --- a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il +++ b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il @@ -8,9 +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 {} +.assembly 'FilterToHandler' {} .module test.exe .method public static int32 MoveBetweenFilterAndHandler() { @@ -54,7 +55,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 +84,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 bf09c960771e1..e9c2a8c03a23a 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 22316838efbf2..ae4736213364e 100644 --- a/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.cs +++ b/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.cs @@ -1,20 +1,22 @@ // 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 { // With below flags, we were using uninitialized compCurBB during insertGCPolls() // DOTNET_JitDoAssertionProp=0 // DOTNET_JitNoCSE=1 - public void Method0() + internal void Method0() { Console.WriteLine(); } - public static int Main() + [Fact] + public static int TestEntryPoint() { TestClass13 objTestClass13 = new TestClass13(); objTestClass13.Method0(); return 100; } -} \ No newline at end of file +} diff --git a/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.csproj b/src/tests/JIT/Directed/coverage/flowgraph/gcpoll.csproj index ddf15f1060487..30dd6c657ca70 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 cb5d95dcf596d..0b0190018c8ad 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 3493e897834a6..c7074b8e6d70a 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 18b9f1f454da3..e724264fb4ef3 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 6d42c779dfd70..1c43546f181ba 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 19f8d02fd91f1..fe3abb5b4f041 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 e136025b21e00..d226111edb810 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 4e3d3484d7284..2382dd1a26473 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 db13493c80e57..2abab0330ab0b 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 fc33ce9a308cf..ac13045b0b147 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 4f580ce2fbb4f..48b2d127f48c7 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 a028ce1065155..39c1b0d0fcfa1 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 bfbc962a7bdad..f5c711268ff9a 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 4d617170b3b31..97dc7e3f50c9e 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 3a1d6f4106665..6dad7ed0e73f4 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 2e579ca4f1115..ce49493701ab0 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 307216c20e672..37f27b17db25f 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 76b136128f57e..e4e3443528f8b 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 fdda1a03f372b..97637457258c3 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 b84265098fa0d..0bec008c6482e 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 c77909a7c58f3..d3d3202c5d5d3 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 f814c3cf4f5f7..ec0b1d17b60b9 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 1e75d0abe6b8e..a5d7348e4df9a 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 a3be82f4368f9..0029b94771594 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 5e5d75a841d5d..811df505fbfc5 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 e258880770b8e..5a88eb78ad828 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 cca048a5a0b7f..57b15cef85ef8 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 d23b06edd0f37..e4f77232a4590 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 2673e0046f50b..e3adde00b2109 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 43e0dfd836835..51e8d6b262b9e 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 0fcae53685c33..9e38be6e269f8 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 64af908654e07..015e493e52d11 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 a5934ed164292..55b4329d9038e 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 4fd81c4f78c1f..5e888e7cfacd9 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 57d8c1001fa2b..6ea8d59fdc736 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 1a7a5d815c081..3f8571a33a303 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 115838aeb2143..9e77e2fc868ef 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 ef890985f9a2a..fb24509ed73de 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 635909719cbf4..c0a4ad6b54581 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 a32015ef54513..fb290f83c6ea6 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 d78efb98d8f25..5223270db8c25 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 3d6100f038d39..8e80e594e5318 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 cda1c39e1d5a7..6c3495d208146 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 f7d53c963a1cd..a638d4ea52be9 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 8bb7bbdc12261..4ea747e6fd695 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 d81771a0ca28d..a16f7ce03898a 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 5e6c0d3bd0262..fc0e0a22b7435 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 760bd88251402..c349c9a3efd29 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 4ba3980e4d8e5..4e72319324b67 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 72bc8fc5e453d..27db7a435a6b9 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 e6ba5b137eb91..788a8819226e1 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 7152f221b9aad..2aa185332e6dd 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 d0823a4661b93..3a019a112888c 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 f9dfefbb12ff6..36a72c6a2d72a 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 47ced3801f2c7..b3ad96a67866d 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 ab64f16e22557..e7bc3116e7a0a 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 b2c74b5218580..68581b6a5de11 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 860462950674d..36955d9d10e25 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 57b20c8b0ea86..38e8109c662c2 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 defc291a97581..5b652b4be8ee2 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 742f083d45bb2..adc58ab5e0b05 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 eb9587c45d6b1..3debb73bf4f62 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 c7d31893edb1e..1c9bcfec612d0 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 ead260abddfef..ca9422672a6c1 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 8338c78cb9520..2262cf230db75 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 9c8497d2a8d02..43b028128bca9 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 095feeaf1fa6c..5c9e5cb503fe5 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 2db8e9d868b43..acf27417a6c05 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 7b6f82add294a..c7dd67dae5b3e 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 ce242d362866e..69eea4da37a72 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 9242c703bd322..27d4cb828eec6 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 316e177d7d32a..e777c2b1e405c 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 305c686106e6c..cff04f56206d3 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 4ac99622344b4..10e3a24321779 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 3486aaf0186a2..d8de9a40252ec 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 a9e89d3e2ad2c..1556f8c76ea6c 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 55d75c861a7f3..726a554d1a62d 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 147ca65818d0c..db0e7a1222a87 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 b13a09d8667c5..cb245123fe4c7 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 6e9d334bfcd0d..4b85a17068778 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 e019c95543669..fec3902875849 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 31ce720ba1eb9..5b86402f03485 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 94a3d0023d18d..c3ef04460b562 100644 --- a/src/tests/JIT/Directed/coverage/importer/subovfun1.il +++ b/src/tests/JIT/Directed/coverage/importer/subovfun1.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 ) @@ -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_il_d.ilproj index 36ee659d40f89..c680fe3906a22 100644 --- a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/subovfun1_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_il_r.ilproj index b0a578bd5196e..fbc35244f7dec 100644 --- a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj +++ b/src/tests/JIT/Directed/coverage/importer/subovfun1_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 fc30c0e380ed8..5b8bc5eb52070 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 78e1ead6e0dd5..c380eba5a6f88 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 5b83457785a9e..50675f1d57c19 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 102d642eb1092..97181169ff1dc 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 732b14d5a6260..65f5cff212745 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 8c23ea3c52eb3..39a1dc7d88f6e 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 ad36ee943bbe7..b27c9ffa502db 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 68d479ff4ef70..5236449762959 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 7beb018cd7923..a64219d32fe76 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 e8638c4cebbd5..950bc1482b6fa 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 c6cccaafcf70c..e1d3c6ce0a813 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 81f41501d4bc1..1ce4add3416fc 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 d7d5bd9630877..60208eb75d8da 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 2420f5a8b13a1..a5104cf92343b 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 20dca930e86e3..5e474712538e0 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 405cb8522b451..cd1a4b15598fe 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 cf5988be166b9..47f01a70e2517 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 be7eb96653ebc..3fda448c4ee62 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 e8c1e3136611a..e1f74b623c387 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 0355dd71139f5..5e1a402f3c234 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 2fdb41cf789ab..228bc5502f844 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 934222d3bf68d..d98c4d1167e7b 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 dc9f6b67010af..30e8c19ac581c 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 c6c80813b226c..7a8f48974f45f 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 33173bbef1119..ab7b35dcd363a 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 a934cdea87b88..7c19ca4bab599 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 0979c29f0732a..767e58d9526eb 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 e96cd7a421bb7..281d80ad36307 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 5720cee86ef66..4b075e71408a3 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 0e43b100880c6..fc747461a7057 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 8f25033d8004a..564c8bee548dd 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 5e70fddf464b3..884fe70837493 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 fde10f03831e1..56a77a19e65ff 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 39a5b5de9bc25..f2c5a91f066e2 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 c3f9a82e5954d..6f3c1f28bf62e 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 46fa4da2998ec..3d2323fb7e5b0 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 4fd834f0690c0..5f84a07e4ee23 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 05897322bf756..01a693e3196cd 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 841ff273bba61..b383a61e72232 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 8358e8b4d6209..e862465a8e237 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 b666252774240..9dacde082b8a6 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 14efb0280aa19..49875a768f4bd 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 e238abdf09e27..3cbde5da070b7 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 546f6114c3d68..4fb8858baf5c0 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 3c2dca87efd5b..0949405e77a30 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 33678e98862f2..778d664185801 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 9b1717895fdc3..57259f71400c0 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 967516589493c..ba50ad90cfcde 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 a65072a58e2c5..6040c58484457 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 36b9ac24b7ab1..5170ea4c203fc 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 1dad7f78726c5..0216cbd0f7563 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 909706130753c..48fa998e86541 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 a33047565415e..235535b581753 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 7a86e40935fc4..4350bc3ebe211 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 1213facc54d08..9cb9b69e53e95 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 cd43d40445044..8088ea9e9a886 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 36fc8bbbf2e3b..c19fce5a16b16 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 e816dda6d772f..3bdf6a289139f 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 a4748829f24e1..617b16ef91af3 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 1b818c9249b9e..6f91e6012581c 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 bd0dd659774c2..597e8024dbb36 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 96b2f34233022..53e37d8c22b52 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 599f495d59ff0..34a01efaf4df7 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 ff0ef67a104b2..bbee5979d5e63 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 5f1476e71df7e..413fd1fa325db 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 ba0691289abf3..4d50aafe30776 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 c0ef8cdf51548..eabd985ba4512 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 643c45148d4ab..2a3cae8e0a262 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 3ec424b4e70a4..0d5c1cfa8e268 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 4654df112ed2d..9c3dd7130e7cc 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 a8825276528e5..53340aa1c992f 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 2e95320cc5e94..2157aa05a5ba5 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 429afeb43e91a..5687fd1819d19 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 e9e1f33e26e04..2c2fd0899a8c6 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 1d2a5b25dbf99..631256f798c31 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 3f877a1d2a322..94dad56a1bb44 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 34c410261ee0b..a3a8bf70858c4 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 e019c95543669..fec3902875849 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 cf4b4bffcb76d..8a995fdc2e1fd 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 b6e1fffc31cb6..be1b5018b0dfb 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 ee420c74357c9..7283e729df9cf 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 cdfee456638a0..dc628aa1154e7 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 e12abb04248e9..4fbf54c1a3c84 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 8ae7a51df6385..684da5733a393 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 3a1f5e8e5644b..fb22770592285 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 84febf17680c1..5b404eb36a06d 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il @@ -9,28 +9,35 @@ .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 ) .entrypoint - // Code size 49 (0x31) + + ldc.i4.0 + call int32 switchdefaultonly1::MainX(int32) + ret + } + + .method public hidebysig static int32 + MainX(int32 arg) cil managed noinlining + { .maxstack 2 .locals init (int32 V_0) - IL_0000: ldarg.0 - IL_0001: ldlen - IL_0002: conv.i4 + ldarg.0 IL_0003: stloc.0 IL_0004: ldloc.0 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 ef2213d4d9ecb..5e1345a9a7b92 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 59075cf3b2d12..10320d32a77a9 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 89c700237f4ab..05de8c052be4d 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il @@ -9,35 +9,41 @@ .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 ) .entrypoint - // Code size 49 (0x31) + + ldc.i4.0 + call int32 switchdefaultonly1::MainX(int32) + ret + } + + .method public hidebysig static int32 + MainX(int32 arg) cil managed noinlining + { .maxstack 2 .locals init (int32 V_0) - IL_0000: ldarg.0 - IL_0001: ldlen - IL_0002: conv.i4 + ldarg.0 IL_0003: stloc.0 IL_0004: ldloc.0 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 a6a9ac9372b4c..f533d1495c21c 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 bb42967b7c8fa..eee70d7c828c8 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 a6f55389a7a32..5f27849498995 100644 --- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il +++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il @@ -9,21 +9,27 @@ .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 ) .entrypoint - // Code size 49 (0x31) + + ldc.i4.0 + call int32 switchdefaultonly1::MainX(int32) + ret + } + + .method public hidebysig static int32 + MainX(int32 arg) cil managed noinlining + { .maxstack 2 .locals init (int32 V_0) - IL_0000: ldarg.0 - IL_0001: ldlen - IL_0002: conv.i4 + ldarg.0 IL_0003: stloc.0 IL_0004: ldloc.0 IL_0005: ldc.i4.1 @@ -32,7 +38,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 476f70ef6b04f..007a2b892f4e1 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 b66a00df6c2aa..916cbccf20a67 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 b3d705dc85bf3..6611b7dc4f6a8 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 475ecf560d1a5..587d86267cc89 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 01a177a1c2d7d..c912d84ea5ab7 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 1843074084e1c..8e32cb0bfc21e 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 2bda7d004dba5..57c53b4b08c0e 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 d9ad92c6b3138..2492802403896 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 3a2c2de5eaedc..afe01f714294f 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 40033dbf0180c..000d602094950 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 5f3882869ac54..8fddfad376d40 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 ac3e75e2cd5df..c1d31592a63ac 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 99ce6db8df2f4..a76cdfbb36f11 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 97715de9c8df4..a24818adec0f5 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 826efdf6b7a28..cab3472ea0249 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 96fc7e75e89f1..f6cfe3f42f585 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 9cb366119ccbd..c5bcccded9270 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 b2691ab4cab22..50009e3f69b2e 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 fb39d90611584..d9cc10fd55eb8 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 af91f7a1d2336..8812126fe53e7 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 440e57beac9ae..18d5ea8719582 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 054c0f20225f2..ba58adbd72df6 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 0da36ddeb4ba2..d9f2c09f4163e 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 9db8c85c2e321..ff234a4ab8364 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 350c87febe25a..dd69027491e9f 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 b3a7899956ecd..4203ce3dfa336 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 97ccf76701d67..15332f77c63db 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 9f93cddb8233c..d83fa3a57b796 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 5862596776a6e..633e8fa521a05 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 e59d59a249621..f193693bf6475 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 e19cb1ff67129..379c76b73b48f 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 f54ab969a4761..08f58f7d8e0de 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.cs +++ b/src/tests/JIT/Directed/intrinsic/interlocked/cmpxchg.cs @@ -5,10 +5,11 @@ using System; using System.Threading; using System.Runtime.CompilerServices; +using Xunit; public class CMPXCHG { public static int g_static = -1; - public static void Function(int bit, bool value) + internal static void Function(int bit, bool value) { for (; ;) { @@ -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 9ed68b4784908..d86867c6f231d 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 0e4086ef5e432..0d21205c64547 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 46fdef9107276..d56091dbe67db 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 8dc1069b4b3a1..0319078517960 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 77007aa9ad972..c1e5f4e3219c9 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 d6008e6fb820f..b3565d94093ec 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 c5cc7972c988c..73bf4cfda6813 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 15c1705bcfff5..a7a32d18802b2 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 6689003878840..842024358ba7e 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 04d1b8eeffb60..3d7375e7a0c02 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 249be975165c3..9a93a9329a01e 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 4cec2514b139a..5beaa32ca2cd7 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 49b8a62952d12..64bfb5bfe1665 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 index 31ed7946e5ebf..f91d13707fed7 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 index 875982dc52b4f..d3124ae88387a 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 index 06ed19be79459..46b466b6d9960 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 index f8b67107c4d2a..5678026ebd11e 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 7b34cbe205d47..b2192d8fe3044 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 85bbb1962fb7e..4fa982621f6b4 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 7bc43be7cf218..3623417092b73 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 eddd5246ff1b1..58c5f46cd0ced 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 3e7e261c1dd58..3749181496b3e 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 cfbfeac81b78b..f13105be8d92a 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 2c35a02b2b179..6b41fcec89f07 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 feab0d7256c6f..fc8e9cc75aaaf 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 4bb6bcc55efa3..f147b929220dd 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 eed91bb0f0d61..be728b3d302dd 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 540e15147fc49..9171ae6c56a9f 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 f56912064d150..a2699d753a005 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 e319c9d57c224..a0b12817311dc 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 88ba5dcfc732c..8a01bddde3f37 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 46df4073e171f..c5e650360f6fe 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 e52618156094f..f740a283b3b4a 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 f6060a795ef7f..48caeab7362e8 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 53afac4ba4c5e..88b87e60e6e6b 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 93e55a9d540d6..4e7c9523cd61e 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 ab055d704b62c..372707cfcad07 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 798860e646ef7..b8079243adf8c 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 2783bf40ee823..398f0d62273ec 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 b62285bd16ad9..db8568cc100a5 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 278fbe4281b96..f2f27874cf762 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 c5a87ea4de865..54c25e37ed36f 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 392f076f8b4d6..1e193a27078e6 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 e15d564c3e326..7926f1228be42 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 c110f15ce7c80..82b3295827c3d 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 a2700d28a47b5..c9c5cd5253609 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 813eb49f488af..3b6350e9b1882 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 bdd54eecdee02..30fb504ffdc2b 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 6f9090c13075c..275176991c3f2 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 fe7abc31d1b8d..476aa50c5594d 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 ad36334c67cbb..ce9d30b766a30 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 583bd08643927..08eafdeb26be4 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 d9ea48efcc895..ced72c99223bb 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 d750325512fd9..507dc5ab682e8 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 474f2cb528e9c..54117bad2dbde 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 d750325512fd9..507dc5ab682e8 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 70819888a2587..18e8fb20f3fd4 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 e8824612281a9..4c87787611dad 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 7ab5b491cc3e0..1567dbd3210dd 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 c5776b8cab564..32332ad8fb23e 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 b20cddd71d826..9aab22dff945b 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) { @@ -13,7 +14,7 @@ static public int f(int i) return p[0]; } - static public void f0() + internal void f0() { while (true) { @@ -21,12 +22,13 @@ static public void f0() } } - static public void f1() + internal 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 5aba2f0f5244a..f9b0d177f9fd2 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 11b3601397867..f7fb087ad4337 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 d601e0968ba81..305b9d725081c 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 3f74ca0c0755d..c185ef8be9615 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 e7ec5d314d0bc..18e16a8fe15f6 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 9dc98caff81a8..17ce8036e6a82 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 49d019f873884..8d7d0ccb64ef9 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 cc9ce5e4fb95b..98155b9a10fa0 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 adc0b4fa99957..7a0c22fe4800c 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 f636c4638f65a..c4053066f29ac 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 ef07c0c3f53cc..ad151765bf7b9 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 1cb22113619e8..ee08f5344a689 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 c16611302bdab..8ad4a64fbfcb2 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 3d5b6d780781f..9f303bc0be4f4 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 650e74b623c4d..ddb068abf09c3 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 5fc305d39cc21..d601fb80bbacc 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 0893bd69001fd..b3ef25cb52f11 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 cea5ba3066564..571511f291b28 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 19eaeafc12451..314859cb3b896 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 fb39bc9811a3d..3842d9738466f 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 99af47b148b99..d1c5d38e51bad 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 9199cd42de714..f7c45059200e3 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 620902767a78e..878e16a8d8647 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 34071eeafcb00..277fe772e9504 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 c8f5a9c275987..b54b09de26530 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 fecef584b6adc..c7b7ad1ffd16a 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 3c90a6bdfda05..a5b80d4c932fd 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 6fc3fc1444ec5..3382de72cfff7 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 e956bd9006741..1016777aa5f47 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 15cedfb58b1d9..2e58ee02274be 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 2e96673863a30..9d9f9e7ff2bf2 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 4666277640ee6..565a3226284e6 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 e55cfc8413dc1..7547fae7c4737 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 6c8523eba5eb8..c49444c76a8c4 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 01f2113e8bafc..b255b48a75ce6 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 8f0ff92210cf7..1d7bbed45bdd2 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 0f9638aff5505..5296b80fb3b1d 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 9b9ab5d893e3b..71726ef42ffe8 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 0a5e94b00fa54..7ce37e40720b5 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 a2ed05406ccdf..56ea4e183a790 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 3ce7e88f88ad5..6ab4de272c838 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 f60c9a6664874..f526947f878ca 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 cdfeb2ac942d6..90bcc3f8610f9 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 007389c2667b9..40a3da121f91f 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 15bbef729d26f..da1aa17655644 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 749b1f23c8975..ede27961c4fc8 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 34744812c8927..b66da132ee77e 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 fea75d031b0ed..e8f79d5383471 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 f51b4298ce4d6..c643baf63ce38 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 5d79828e64efb..bcdf5eb1b4e9a 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 f0165e735a52a..d87c6ceb3cf7a 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 ca7652cede4bb..f623daf60f957 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 dd66daa4edc21..adbad9caec276 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 8629cdf281d15..e371868982743 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 1fd3644afee36..17c7038594a58 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 acc1d7fa3d206..2dccb1127ba57 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 40791239d2da9..48fab0d5e616c 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 86af0c0a15bda..923c18fdf7862 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 2bb0036ef9d48..338f3875c4a61 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 b0cfe5f63d452..f1fbcbad5f041 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 9ab3e5b65463d..9bf7f5615f041 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 c7abb292cb6a7..d90c64a310365 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 { @@ -27,27 +28,29 @@ public static class Test_nullabletypes { public static int counter = 0; - public static void IsFalse(bool value) + internal static void IsFalse(bool value) { counter++; if (value) throw new TestException(counter, "Expected false, got true"); } - public static void Eval(bool expr) + internal static void Eval(bool expr) { counter++; if (!expr) throw new TestException(counter, "Expected true, got false"); } - public static void Eval(object obj1, object obj2) + + internal static void Eval(object obj1, object obj2) { counter++; if (!((obj1 != null) && (obj2 != null) && (obj1.GetType().Equals(obj2.GetType())) && obj1.Equals(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 ebe3a84ef2beb..716bbecf05b2d 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 63c1bfa7fae64..a465cb8574c96 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 b6855dd3bc77f..a8df8e8067591 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 53b344d60147e..38900ed83be37 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 66a8cd648d457..a74f1736760aa 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 6122be47ffc7f..349a25d6b6b1b 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 194db96e3dabb..1a3b70967d32d 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 1c06ccfef381a..cb0924a7a5580 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 a20ee3390f34a..5b27243f851f5 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 4f7ce1953bc16..f6f4b5a9ef2da 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 19560a0828cd3..ec2f399aab0e9 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 33569204c3204..e5ab77bf5c562 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 ee8de2504abba..09f7da8ffec51 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 ec00e3fcb3af7..1ad2a08a758dc 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 e376f237cf3a5..27f977493fd21 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 cefc6eea065c1..5b2af929e4259 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 44f2b3962d10e..1b3316e7e224b 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 ee901a2826ad3..0e0edd83f2bec 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 9b6965c036190..41cade5db8b4a 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 fb659268bbce1..567a95ce1651b 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 f3fc7cc4a4aed..3f89ea497d33f 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 c769c50222743..89cbb0f298701 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 da4e8a3ce6336..540aa556ce217 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 67f0f70a7bf90..df6fb5e1a7b7d 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 4368e08e1d04b..e59519cd28d4f 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 4bbd8df0879d2..d58fd0698f915 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 56b97d77fc056..fe5eeb0fa5200 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 6427e23082cda..8536cc4e57ea6 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 7ca04382ff497..b55a59dd87be9 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 78b2a8a880c3c..a09e739cbaf97 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 ece9f62cc481d..4c1b9407eb972 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 6669a84c08785..4ea2a4a4f42f1 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 70772cf0b53d8..5d549749908f4 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 c5e98f0f768b5..9b5689ce3d077 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 87320d4ad3373..664c3a975dffb 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 ef877a15c74ce..ea1b5b84a4ff8 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 aa1e67040eec7..a92e85b462024 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 17f76b2af85be..7097390ac2ad5 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 ef1647f78cc50..9b1af1eca9c5f 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 bdfe07c39145c..a6a6aca68ab8c 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 c0650ff237457..472f2e0a6f709 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 ac44b38a13bf0..c55fcdf0a4918 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 0b3805a811890..362d304aa013b 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 ff0c147ac9d7b..6d4fbcc0f6dfb 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 d348b684c9eeb..4333450040364 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 0261dbe92cd2c..236bf1fdc5d2b 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 99cf7ce6ae94d..1b949577452b6 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 c42a7f892be30..b507082b55b00 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 43f74abd94cd3..817b0843d7d59 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 9ec7a9a2e7a21..3e211f3297129 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 054e855290c70..7b48178b311a3 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 e39c17393ff0a..b2cbd11acfef4 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 d8140fc007cde..ea7779dc18258 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 ca013c8ed7a1f..bafa9137025b6 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 c8970628e885e..593f241ca0968 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 80c3f596065a9..5adbd19844b7c 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 4f40180098e56..622c345ddd5a5 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 4fea337956ab2..503fd57be3211 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 fd673bc0505f0..013b57aff6dc4 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 d5a38763dc1a5..0afd4df87acd9 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 251907cace64a..3c2e6d1383204 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 aeb65b1933f67..353921da02eea 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 9502f9ebbd922..de470d1085aa4 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 0ede6779c6b66..69e587ec0128d 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 3b8aabbb81a23..2e818485f29ae 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 67214829feece..f07caf71ab98a 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 9e9a6c2ac367b..6c70c189d7551 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 0bbf06feddb12..a53ffbe98d133 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 c66e341237ca5..85bbdfc7fd399 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 bc5f2823ac821..e0d74160154c1 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 01e923f279a8c..ce78f7dd8cf40 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 cbe12116ef939..fb7e59790db10 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 15e25ea12263d..3bcefab622043 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 9c1cd4f632c05..544fe7a84b5f8 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 d0ad4e1991534..7699ce9941952 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 47e5bd2be4681..3bac8525408c8 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 6e778ccbd9f6e..6007ac2cfe88d 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 c0539504f3f3d..318e3db1f329b 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 de22c7242202b..351c5a5ca54bb 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 634e62d5c89a7..5cb16ecdb6a24 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 index c774fe48c1ebf..983a979a2ea86 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 9cb52b3cf3053..ad59c0107f814 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 44d99e73cdae1..b5524abdb4546 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 cc5ce795fa8df..c99e829584271 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 023e96e86fdfe..883d2eefe1b3c 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 7cbdf001cc016..7658eb499be0c 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 62ef4203e994f..933564b6e8fa6 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 6cb15030b9e71..1af9c0f2190ca 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 5b9fe4bfe6c31..6b5947423201e 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 71cdbf78d3572..98212cf9d069a 100644 --- a/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il +++ b/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il @@ -24,7 +24,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 +164,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 1e653680c6d36..4f8c34a349162 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 c2a2ed045478d..aee1f1f74d090 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 9585f0c749b71..87a8a31a7ff51 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 d64818ad15ff3..9336d6f12a399 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 c9d2279c2156a..4ef9fca63ec4a 100644 --- a/src/tests/JIT/Directed/pinvoke/sysinfo.il +++ b/src/tests/JIT/Directed/pinvoke/sysinfo.il @@ -8,11 +8,11 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly sysinfo { } +.assembly 'sysinfo_il' { } .module sysinfo.exe .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 +29,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 9f26dac7276c2..256010d5b51b8 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 bb0bdb80a60e0..edc9350926de2 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 1629d1d1be534..dfec04708f9a0 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 0b7cd5c1ca43f..f83cfbe2e2b2e 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 0cf9a01b2463b..5b866e5062ad7 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 bc2417fa255b5..955702aed096d 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 02b166466892c..7b32b41de1466 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 4c741b635cddf..888ffa3a66525 100644 --- a/src/tests/JIT/Directed/refbyref/byrefconvert.il +++ b/src/tests/JIT/Directed/refbyref/byrefconvert.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 ) @@ -9,8 +10,12 @@ } .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 +31,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 b381cdccba4a0..613358453e021 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 4e143ed488cac..c69628a6d382e 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 b2a5b3dd37b14..0b3b08e24fa8d 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 c00ddb74c25b0..57a097e55009b 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 d66b453a492c6..17098228b670c 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 a7669a019b808..ae0bc2e0d7a89 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 c9b176b233e34..b41b766efae4e 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 b16e6bf685014..1a90c13cc9c46 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 16a2312f9c8a5..f9dda179c3d71 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 6c0daaaf11f94..5447d81846d9d 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 a47a7786f7954..f83d611082d88 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 5d850d1dbf8da..aa890a596d07b 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 84289b19116fb..eb2a6d94c73b9 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 ef63240c63012..bf9948bf66841 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 fbbc35681d417..f59d29dcb46d0 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 9fdc68e4e532a..bb705d1ed1ebc 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 ba7d95392075e..fb54c95c7b3e8 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 5c65f3dd1d445..dfd5c8f219fc4 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 e38408e011c4c..b65a2459cd1e0 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 c387293476778..cb837e5a3193f 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 ff47bcbb5a5ef..4747e347c75c3 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 bfceb0e1e1de0..50f26e8c963c0 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 b272a35b7a852..454a4912e0966 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 82bd09585b9ff..f90b607239021 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 65a52aae2bb45..f41543e91afff 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 3ad078ba23b29..c48dfc58fa1b6 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 e985871f077e5..4bc4749799b4e 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 e854436ceba5b..7d05a264ec8b9 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 af5c1466b53cf..0000000000000 --- 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 949ed70a4bae9..0000000000000 --- 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 a403bd18de71b..504c60fa275cd 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 9c3b80b1b56ba..046cae5c16bd3 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 d829c20e06046..6fae92c997a6c 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 4ae1a6821ba6c..2dad18d266675 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 d0f4dc54aee41..c3111ebcf133c 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 d3c18ebfb4b44..58c5761e60fff 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 2cafc530a26a3..127b1b02b5d51 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 e00a7ca65df3f..0000000000000 --- 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 e2ec889b0c702..0000000000000 --- 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 efb5c4b737030..38a64e66b053f 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 d68a6f5fc5288..b92c75753070b 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 ab86cf929f1be..fac1b3509d1b9 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 5d2b48bc9639e..9ff4c106c6816 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 b83e1ce3b7ff8..b81eee8be1210 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 8773dca2b5f07..a06d291d1fc91 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 d31d8b0c08794..05e46dc88a1e7 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 33241fc28b96f..f054afae4102f 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 ea83f29a83339..e9ed0680925a3 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 206964a448c95..a23587773813d 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 2602f57f554f7..232ef7c95fbfe 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 3e66d9ab0ff15..b895ac4a94220 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 84afe10a6e098..04a0586e0a94b 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 0b3861bd8b8c9..cccb946d6e908 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 ad2bb19f55d85..19fbb7e2d75a0 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 283309769d473..7088f8a6ec273 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 e65f3392aa4f2..8286acf46e50d 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 9e33e8078e260..f1a831b71f1ee 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 de09b7437f937..41519ddc80492 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 a0c0f42cfa2ad..8649be239b6fb 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 f45d958a93de8..d116b4993c490 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 009b7a37e7147..0000000000000 --- 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 daad4b9150ea4..0000000000000 --- 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 5b7c0c98f5279..a7f9bf904b4eb 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 a32333dc683e7..cb5c10be10369 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 e4135dc93fbc5..5707fb4530154 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 b63ab62dc8496..745f0b8e59a0a 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 2dd6ddfdb0dc8..187c4ed5697d5 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 fd7f81da165e1..647980ae9fee3 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 46f00b65bd43c..710995464ff7e 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 ae28c138b80ed..0000000000000 --- 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 fd487f236c993..0000000000000 --- 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 e5e6d97261279..e04ab62b5bc7b 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 a9904ed3a2acb..adbdf821b4e9b 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 914a9a8c4dcc4..abe5902ee1315 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 93fc49ceb08d1..c12b8bd37e3c8 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 ee161b970bdd1..c273325d5224d 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 b1861d12a0941..bf90e75ab53f5 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 795efed379235..d89cc69d91bb6 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 4185d84cc31e1..4162727d91a91 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 1e203657ff99a..aadba6cee4794 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 dc9e9e37be499..54e88bb258809 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 72fce7931cb4c..1234a12964f21 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 d6580f188bbea..0c831b4cc5a8c 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 78f948cc56d7d..05c9b10c06ef8 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 25d775231e7f0..725054245a248 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 69a77c7da3646..602ac9353a850 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 b66d0639bb587..b3f15619ad9c9 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 eb8aa33206075..30435f9bce9f3 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 34bf43869ce22..0000000000000 --- 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 ea6eff39f3512..0000000000000 --- 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 12ffc702e652d..31ce989e39932 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 ebf27555a975d..83b542b20d752 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 b5f8e7aeb9391..0f5c6d1feb222 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 ef42d5fd33058..d5584433c2002 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 9e0bc4c27a656..3f6be099a84e6 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 27be898bddbee..83624287a592e 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 9e0bc4c27a656..f55744c790fa8 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 6973caff7ce61..0d88d60522bfc 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 16670f7930e35..b66a0bced144f 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 e9b737e4c0be7..d98bd4e2e680e 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 fe11d05fad65d..15b358fd0d448 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 93698e1b4a0ea..0cc4098dc481f 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 445f8c0b7e3c7..034763923b36b 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 35ae886c50e78..1394ddc830bf1 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 a140225c9d7ee..73fce1167aac8 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 5d2fcc62681ec..4e2906d35a26b 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 0704e219dcaa7..53740d1028731 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 index 3b2597639f2b8..4e6ca1703622a 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 index af94f9741dbf6..0853bde29add5 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 28b3a86b80575..be5346fbe0cf4 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 2a721820b2b5d..cad4187c88e3c 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 e58048f2df849..3689d1adc32d3 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 f9be1f5c637a3..a0c8a517d5d00 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 d2c5760cf2e54..1accf570cfdb2 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 124e01d68373d..b0dfeea29655c 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 69284a32eeb80..1fb82f371be75 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 da55918580a8b..ca8aff4d02caa 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 3834a7126108d..92229c2f3efef 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 4fb204c4af0e4..76bbe65f6522e 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 1d1b7450ac361..8cb310fa152ae 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 c3b2e2a9f7540..09136151f4241 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 d7b27d340832b..c20b1dd2e215b 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 df7547e6a4357..7b23b5c0eceb0 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 c552ec1d37ddb..ebc05eb839f3c 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 01064d2f26822..21f78c9008a1f 100644 --- a/src/tests/Loader/classloader/Casting/punning.cs +++ b/src/tests/Loader/classloader/Casting/punning.cs @@ -6,10 +6,10 @@ using Xunit; -partial class Program +public class punning { [Fact] - internal static void Via_GetFunctionPointer() + public static void Via_GetFunctionPointer() { Console.WriteLine($"Running {nameof(Via_GetFunctionPointer)}..."); @@ -24,7 +24,7 @@ internal static void Via_GetFunctionPointer() } [Fact] - internal static void Via_GetFunctionPointer_Generics() + public static void Via_GetFunctionPointer_Generics() { Console.WriteLine($"Running {nameof(Via_GetFunctionPointer_Generics)}..."); @@ -39,7 +39,7 @@ internal static void Via_GetFunctionPointer_Generics() } [Fact] - internal static void Via_Ldftn() + public static void Via_Ldftn() { Console.WriteLine($"Running {nameof(Via_Ldftn)}..."); @@ -54,7 +54,7 @@ internal static void Via_Ldftn() } [Fact] - internal static void Via_Ldftn_Generics() + public static void Via_Ldftn_Generics() { Console.WriteLine($"Running {nameof(Via_Ldftn_Generics)}..."); @@ -69,7 +69,7 @@ internal static void Via_Ldftn_Generics() } [Fact] - internal static void Via_Ldftn_Generics_Virtual() + public static void Via_Ldftn_Generics_Virtual() { Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual)}..."); @@ -85,7 +85,7 @@ internal static void Via_Ldftn_Generics_Virtual() } [Fact] - internal static void Via_Ldftn_Generics_EarlyLoad() + public static void Via_Ldftn_Generics_EarlyLoad() { Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_EarlyLoad)}..."); @@ -100,7 +100,7 @@ internal static void Via_Ldftn_Generics_EarlyLoad() } [Fact] - internal static void Via_Ldftn_Generics_Virtual_EarlyLoad() + public static void Via_Ldftn_Generics_Virtual_EarlyLoad() { Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual_EarlyLoad)}..."); @@ -116,7 +116,7 @@ internal static void Via_Ldftn_Generics_Virtual_EarlyLoad() } [Fact] - internal static void Via_Ldvirtftn() + public static void Via_Ldvirtftn() { Console.WriteLine($"Running {nameof(Via_Ldvirtftn)}..."); @@ -132,7 +132,7 @@ internal static void Via_Ldvirtftn() } [Fact] - internal static void Via_Ldvirtftn_Generics() + public static void Via_Ldvirtftn_Generics() { Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics)}..."); @@ -148,7 +148,7 @@ internal static void Via_Ldvirtftn_Generics() } [Fact] - internal static void Via_Ldvirtftn_Generics_EarlyLoad() + public static void Via_Ldvirtftn_Generics_EarlyLoad() { Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics_EarlyLoad)}..."); @@ -162,4 +162,4 @@ internal static void Via_Ldvirtftn_Generics_EarlyLoad() int fieldValue = Caller.Class.CallGetField(b, fptr, inst); Assert.Equal(b.Field, fieldValue); } -} \ No newline at end of file +} diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 5a18053d5ce17..3b611e2fe050a 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -347,7 +347,7 @@ https://github.com/dotnet/runtime/issues/12979 - + https://github.com/dotnet/runtime/issues/12979 @@ -371,7 +371,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 @@ -1090,7 +1090,7 @@ https://github.com/dotnet/runtimelab/issues/155: Tailcalls - + https://github.com/dotnet/runtimelab/issues/155: Non-exception throws @@ -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 @@ -2286,7 +2283,7 @@ https://github.com/dotnet/runtime/issues/46622 - + https://github.com/dotnet/runtime/issues/37955 @@ -2637,7 +2634,7 @@ needs triage - + https://github.com/dotnet/runtime/issues/54373 @@ -2938,13 +2935,13 @@ https://github.com/dotnet/runtime/issues/57350 - + https://github.com/dotnet/runtime/issues/57350 https://github.com/dotnet/runtime/issues/57350 - + https://github.com/dotnet/runtime/issues/57350 @@ -3330,7 +3327,7 @@ https://github.com/dotnet/runtime/issues/82859 - + https://github.com/dotnet/runtime/issues/82859