Skip to content
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

[NativeAOT] Remove unnecessary [DynamicDependency] attributes #18808

Merged
merged 5 commits into from
Aug 28, 2023
Merged

[NativeAOT] Remove unnecessary [DynamicDependency] attributes #18808

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24372c6
Remove invalid dynamic dependency attributes
simonrozsival Aug 24, 2023
b7a5641
Revert "Remove invalid dynamic dependency attributes"
simonrozsival Aug 25, 2023
7e3e772
Merge branch 'net8.0' of https://github.com/xamarin/xamarin-macios in…
simonrozsival Aug 25, 2023
9bd425c
Skip adding dynamic dependency attributes to unconditionally preserve…
simonrozsival Aug 25, 2023
dccceb0
Auto-format source code
Aug 25, 2023
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
6 changes: 0 additions & 6 deletions tools/dotnet-linker/ApplyPreserveAttributeBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,6 @@ void PreserveUnconditional (IMetadataTokenProvider provider)
{
Annotations.Mark (provider);
AddDynamicDependencyAttribute (provider);

var member = provider as IMemberDefinition;
if (member is null || member.DeclaringType is null)
return;

Mark (member.DeclaringType, null);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the original code to mark Preserved code, so I'm not sure I'm comfortable with that.

Could we instead just skip adding the attribute in the AddDynamicDependencyAttribute method below instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, I will change the PR to only skip the DynamicDependency attribute and keep the original marking logic.

}

void TryApplyPreserveAttribute (TypeDefinition type)
Expand Down