Skip to content

Remove illink test workaround for removed declaring type #89529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marek-safar merged 1 commit into from
Jul 27, 2023
Merged

Remove illink test workaround for removed declaring type #89529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public static void Main ()
instance.ReturnWithRequirementsAlwaysThrows ();

UnsupportedReturnType ();
UnsupportedReturnTypeAndParameter (null);
}

static Type NoRequirements ()
Expand Down
1 change: 1 addition & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public static void Main ()
instance.PropertyPublicParameterlessConstructorWithExplicitAccessors = null;
instance.PropertyPublicConstructorsWithExplicitAccessors = null;
instance.PropertyNonPublicConstructorsWithExplicitAccessors = null;
_ = PropertyWithUnsupportedType;

TestAutomaticPropagation ();

Expand Down
11 changes: 1 addition & 10 deletions src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,16 +974,7 @@ bool LogMessageHasSameOriginMember (MessageContainer mc, ICustomAttributeProvide

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;
}
}

Expand Down