Update assert enable tests for CoreCLR (#105266)

dotnet · Jul 22, 2024 · d46fdc1 · d46fdc1
1 parent fc6ce2c
commit d46fdc1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs
@@ -194,7 +194,11 @@ protected virtual MethodInfo GetMethodImpl()
                             // RCWs don't need to be "strongly-typed" in which case we don't find a base type
                             // that matches the declaring type of the method. This is fine because interop needs
                             // to work with exact methods anyway so declaringType is never shared at this point.
-                            Debug.Assert(currentType != null || _target.GetType().IsCOMObject, "The class hierarchy should declare the method");
+                            // The targetType may also be an interface with a Default interface method (DIM).
+                            Debug.Assert(
+                                currentType != null
+                                || _target.GetType().IsCOMObject
+                                || targetType.IsInterface, "The class hierarchy should declare the method or be a DIM");
                         }
                         else
                         {

diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/DiagnosticMethodInfoTests.cs b/src/libraries/System.Diagnostics.StackTrace/tests/DiagnosticMethodInfoTests.cs
@@ -109,24 +109,20 @@ public static IEnumerable<object[]> Create_ClosedDelegate_TestData()
 
             IGenericInterfaceForDiagnosticMethodInfoTests<object> og = new GenericClassForDiagnosticMethodInfoTests<object>();
 
-            // Making this work with CoreCLR tracked in https://github.com/dotnet/runtime/issues/103268
-            if (PlatformDetection.IsMonoRuntime || PlatformDetection.IsNativeAot)
+            // Making this work with native AOT tracked in https://github.com/dotnet/runtime/issues/103219
+            if (!PlatformDetection.IsNativeAot)
             {
-                // Making this work with native AOT tracked in https://github.com/dotnet/runtime/issues/103219
-                if (!PlatformDetection.IsNativeAot)
-                {
-                    yield return new object[] {
-                            (Action)og.NonGenericDefaultMethod,
-                            nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>.NonGenericDefaultMethod) ,
-                            TestNamespace + nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>) + "`1"
-                        };
-                }
                 yield return new object[] {
-                        (Action)og.GenericDefaultMethod<object>,
-                        nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>.GenericDefaultMethod),
+                        (Action)og.NonGenericDefaultMethod,
+                        nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>.NonGenericDefaultMethod) ,
                         TestNamespace + nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>) + "`1"
                     };
             }
+            yield return new object[] {
+                    (Action)og.GenericDefaultMethod<object>,
+                    nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>.GenericDefaultMethod),
+                    TestNamespace + nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>) + "`1"
+                };
             yield return new object[] {
                 (Action)og.NonGenericMethod,
                 TestNamespace + nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>) + "<T>." + nameof(IGenericInterfaceForDiagnosticMethodInfoTests<object>.NonGenericMethod),