From 3f60e918c9cfae5fad96a1c532daaf3d24ff0e45 Mon Sep 17 00:00:00 2001 From: AlekseyTs Date: Tue, 29 Oct 2024 14:34:23 -0700 Subject: [PATCH] Follow up on fixes in runtime (enable execution of affected scenarios) Closes #61321 Closes #64501 --- .../DefaultInterfaceImplementationTests.cs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs index e900435541515..28b8ca9a92740 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs @@ -51,25 +51,13 @@ private static Verification VerifyOnMonoOrCoreClr private static Verification Verify(bool isStatic) { + // IL Verify complains about static constrained calls: "Missing callvirt following constrained prefix." return isStatic ? Verification.Skipped : VerifyOnMonoOrCoreClr; } private static bool Execute(bool isStatic, bool haveImplementationInDerivedInterface = false, bool hasImplementationOfVirtualInDerivedType = false) { - // The runtime ignores the implementation of a static virtual method in derived types - // Tracked by https://github.com/dotnet/roslyn/issues/64501 - if (isStatic && hasImplementationOfVirtualInDerivedType) - { - return false; - } - - // https://github.com/dotnet/roslyn/issues/61321 : Enable execution for isStatic and haveImplementationInDerivedInterface once runtime can handle it. - if (!ExecutionConditionUtil.IsMonoOrCoreClr || (isStatic && haveImplementationInDerivedInterface)) - { - return false; - } - - return true; + return ExecutionConditionUtil.IsMonoOrCoreClr; } private static Verification VerifyOnMonoOrCoreClr_FailsIlVerify