Follow up on fixes in runtime (enable execution of affected scenarios)

Closes dotnet#61321 Closes dotnet#64501
AlekseyTs · Oct 29, 2024 · 3f60e91 · 3f60e91
1 parent 07b18eb
commit 3f60e91
Showing 1 changed file with 2 additions and 14 deletions.
diff --git 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