From b30dabd6cba2e2d8772bb6c74bf89c55c334c5a5 Mon Sep 17 00:00:00 2001 From: Sergey Andreenko Date: Tue, 7 Jul 2020 00:56:37 -0700 Subject: [PATCH 1/6] Reenable GitHub_26491. Closes #13355 --- src/coreclr/tests/issues.targets | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index ec07afb575c5a9..e08e75d2fbe507 100644 --- a/src/coreclr/tests/issues.targets +++ b/src/coreclr/tests/issues.targets @@ -305,9 +305,6 @@ https://github.com/dotnet/runtime/issues/12216 - - https://github.com/dotnet/runtime/issues/13355 - From 5ae255400a7232fa68c84ccb07feaddf13743a8a Mon Sep 17 00:00:00 2001 From: Sergey Andreenko Date: Tue, 7 Jul 2020 00:58:22 -0700 Subject: [PATCH 2/6] Reenable crossgen2 tests failing with old retyping/ They were fixed both with and without retyping. Closes #37883. --- src/coreclr/tests/issues.targets | 67 -------------------------------- 1 file changed, 67 deletions(-) diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index e08e75d2fbe507..74818e480427c6 100644 --- a/src/coreclr/tests/issues.targets +++ b/src/coreclr/tests/issues.targets @@ -984,73 +984,6 @@ - - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - https://github.com/dotnet/runtime/issues/37883 - - - From b4faef49161ea4d832cb11a561c045de22cf5ddc Mon Sep 17 00:00:00 2001 From: Sergey Andreenko Date: Tue, 7 Jul 2020 01:00:04 -0700 Subject: [PATCH 3/6] Reenable HVA merge cases. Closes #37341, closes #37880. --- .../JIT/Directed/StructABI/structreturn.cs | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs b/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs index 7b8b9492e6e408..72897ce2dc6f7c 100644 --- a/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs +++ b/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs @@ -1219,27 +1219,26 @@ static Vector ReturnVectorT() where T : struct [MethodImpl(MethodImplOptions.NoInlining)] static Vector ReturnVectorTWithMerge(int v, T init1, T init2, T init3, T init4) where T : struct { - // issue https://github.com/dotnet/runtime/issues/37341 - // if (v == 0) - // { - // return new Vector(); - // } - // else if (v == 1) - // { - // return new Vector(init1); - // } - // else if (v == 2) - // { - // return new Vector(init2); - // } - // else if (v == 3) - // { - // return new Vector(init3); - // } - // else - // { - // return new Vector(init4); - // } + if (v == 0) + { + return new Vector(); + } + else if (v == 1) + { + return new Vector(init1); + } + else if (v == 2) + { + return new Vector(init2); + } + else if (v == 3) + { + return new Vector(init3); + } + else + { + return new Vector(init4); + } return new Vector(); } From c31f6912a1cd75b41ee21be608da18d13b96c70d Mon Sep 17 00:00:00 2001 From: Sergey Andreenko Date: Tue, 7 Jul 2020 02:52:15 -0700 Subject: [PATCH 4/6] Reenable GitHub_35821. Closes #36206, closes #36418. The issue was fixed by #37499. --- src/coreclr/tests/issues.targets | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index 74818e480427c6..ffda2b87c40b62 100644 --- a/src/coreclr/tests/issues.targets +++ b/src/coreclr/tests/issues.targets @@ -299,9 +299,6 @@ needs triage - - https://github.com/dotnet/runtime/issues/36418 - https://github.com/dotnet/runtime/issues/12216 From f483441705bddc48584e6848310c928d240b9b89 Mon Sep 17 00:00:00 2001 From: Sergey Andreenko Date: Tue, 7 Jul 2020 02:54:12 -0700 Subject: [PATCH 5/6] Delete extra lines that are no longer needed. #37506 was fixed in #38241. --- src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs b/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs index 72897ce2dc6f7c..23296bc0767b97 100644 --- a/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs +++ b/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs @@ -1373,8 +1373,6 @@ static void TestReturnVectorT() try { var a = ReturnVectorT2(new Vector4(1)); - // Delete WriteLine when https://github.com/dotnet/runtime/issues/37506 is fixed. - Console.WriteLine(a.ToString()); Debug.Assert(false, "unreachable"); } catch (System.NotSupportedException) @@ -1383,8 +1381,6 @@ static void TestReturnVectorT() try { var a = ReturnVectorT2>(new VectorTWrapperWrapper()); - // Delete WriteLine when https://github.com/dotnet/runtime/issues/37506 is fixed. - Console.WriteLine(a.ToString()); Debug.Assert(false, "unreachable"); } catch (System.NotSupportedException) From 3fe064c19a28fa79d13c53b17e65b34cfe847abc Mon Sep 17 00:00:00 2001 From: Sergey Andreenko Date: Tue, 7 Jul 2020 22:13:04 -0700 Subject: [PATCH 6/6] delete a throwing init. --- src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs b/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs index 23296bc0767b97..0ee8b9b83b1550 100644 --- a/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs +++ b/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs @@ -1393,7 +1393,6 @@ static void TestReturnVectorT() ReturnVectorTWithMerge(1, 0.0, 0.0, 0.0, 0.0); ReturnVectorTWithMerge(2, 0, 0, 0, 0); ReturnVectorTWithMerge(3, 0, 0, 0, 0); - ReturnVectorTWithMerge>(3, new Vector(0), new Vector(0), new Vector(0), new Vector(0)); ReturnVectorShortWrapper(); ReturnVectorShortWrapperPromoted();