Remove illink test workaround for removed declaring type (#89529)

diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs
index 394f615..544e631 100644 (file)
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs
@@ -36,6 +36,7 @@ namespace Mono.Linker.Tests.Cases.DataFlow
                        instance.ReturnWithRequirementsAlwaysThrows ();
 
                        UnsupportedReturnType ();
+                       UnsupportedReturnTypeAndParameter (null);
                }
 
                static Type NoRequirements ()

diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs
index 1c3713e..5dbca22 100644 (file)
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs
@@ -32,6 +32,7 @@ namespace Mono.Linker.Tests.Cases.DataFlow
                        instance.PropertyPublicParameterlessConstructorWithExplicitAccessors = null;
                        instance.PropertyPublicConstructorsWithExplicitAccessors = null;
                        instance.PropertyNonPublicConstructorsWithExplicitAccessors = null;
+                       _ = PropertyWithUnsupportedType;
 
                        TestAutomaticPropagation ();
 

diff --git a/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs b/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs
index bef6cd7..b2c6704 100644 (file)
--- a/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs
@@ -974,16 +974,7 @@ namespace Mono.Linker.Tests.TestCasesRunner
 
                                var actualMember = origin?.Provider as IMemberDefinition;
                                var expectedOriginMember = expectedOriginProvider as IMemberDefinition;
-                               if (actualMember?.FullName == expectedOriginMember.FullName)
-                                       return true;
-
-                               // Compensate for cases where for some reason the OM doesn't preserve the declaring types
-                               // on certain things after trimming.
-                               if (actualMember != null && actualMember?.DeclaringType == null &&
-                                       actualMember?.Name == expectedOriginMember.Name)
-                                       return true;
-
-                               return false;
+                               return actualMember?.FullName == expectedOriginMember.FullName;
                        }
                }