-
Notifications
You must be signed in to change notification settings - Fork 127
Support DynamicDependencyAttribute #1215
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.
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
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
3d4d0e0
Add DynamicDependencyAttribute
sbomer 9898afb
Add tests for DynamicDependencyAttribute
sbomer 3faac9e
Test PreserveDependency on illink, disable on mono
sbomer 51fa3b9
Add more tests for DynamicDependency
sbomer 5dcfa86
Fix whitespace and failing test
sbomer ebe8d9b
Fix mono build with LangVersion latest
sbomer 4ead2f0
Use null sentinel
sbomer e85ce8f
Changes to attribute caching
sbomer 39bb0dc
Use Attribute type in cache, and move helpers to DynamicDependency
sbomer 60efa31
Remove DynamicDependencyAttribute implementation
sbomer aaa9ffa
Don't disable flow analysis for Dynamic/PreserveDependency
sbomer bf5f423
Add tests for DynamicallyAccessedMemberTypes
sbomer b35fe9c
Update docs/error-codes.md
sbomer 0c4154b
PR feedback
sbomer 448e665
Fix up tests
sbomer 1136f0a
Make PreserveDependency deprecated
sbomer c287d2a
PR feedback
sbomer 82eca9c
Use new logging helpers
sbomer ce02105
More PR feedback
sbomer 291ec0c
Use Resolve () instead
sbomer ddf6b6d
Update one more logging callsite
sbomer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System; | ||
| using System.Diagnostics; | ||
| using Mono.Cecil; | ||
| using System.Diagnostics.CodeAnalysis; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace Mono.Linker.Steps | ||
| { | ||
| public class DynamicDependencyLookupStep : LoadReferencesStep | ||
| { | ||
| protected override void ProcessAssembly (AssemblyDefinition assembly) | ||
| { | ||
| var module = assembly.MainModule; | ||
|
|
||
| foreach (var type in module.Types) { | ||
| ProcessType (type); | ||
| } | ||
| } | ||
|
|
||
| void ProcessType (TypeDefinition type) | ||
| { | ||
| if (type.HasMethods) { | ||
| foreach (var method in type.GetMethods ()) { | ||
| var methodDefinition = method.Resolve (); | ||
| if (methodDefinition?.HasCustomAttributes != true) | ||
| continue; | ||
|
|
||
| ProcessDynamicDependencyAttributes (methodDefinition); | ||
| } | ||
| } | ||
|
|
||
| if (type.HasFields) { | ||
| foreach (var field in type.Fields) { | ||
| var fieldDefinition = field.Resolve (); | ||
| if (fieldDefinition?.HasCustomAttributes != true) | ||
| continue; | ||
|
|
||
| ProcessDynamicDependencyAttributes (fieldDefinition); | ||
| } | ||
| } | ||
|
|
||
| if (type.HasNestedTypes) { | ||
| foreach (var nestedType in type.NestedTypes) { | ||
| ProcessType (nestedType); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void ProcessDynamicDependencyAttributes (IMemberDefinition member) | ||
| { | ||
| Debug.Assert (member is MethodDefinition || member is FieldDefinition); | ||
|
|
||
| foreach (var ca in member.CustomAttributes) { | ||
| if (!IsPreserveDependencyAttribute (ca.AttributeType)) | ||
| continue; | ||
| #if FEATURE_ILLINK | ||
| Context.LogWarning ($"Deprecated PreserveDependencyAttribute on '{member}'. Use DynamicDependencyAttribute instead.", 2033, MessageOrigin.TryGetOrigin (member)); | ||
| #endif | ||
| if (ca.ConstructorArguments.Count != 3) | ||
| continue; | ||
|
|
||
| if (!(ca.ConstructorArguments[2].Value is string assemblyName)) | ||
| continue; | ||
|
|
||
| var assembly = Context.Resolve (new AssemblyNameReference (assemblyName, new Version ())); | ||
| if (assembly == null) | ||
| continue; | ||
| ProcessReferences (assembly); | ||
| } | ||
|
|
||
| var dynamicDependencies = Context.Annotations.GetLinkerAttributes<DynamicDependency> (member); | ||
| Debug.Assert (dynamicDependencies != null); | ||
|
|
||
| foreach (var dynamicDependency in dynamicDependencies) { | ||
| if (dynamicDependency.AssemblyName == null) | ||
| continue; | ||
|
|
||
| var assembly = Context.Resolve (new AssemblyNameReference (dynamicDependency.AssemblyName, new Version ())); | ||
| if (assembly == null) { | ||
| Context.LogWarning ($"Unresolved assembly '{dynamicDependency.AssemblyName}' in DynamicDependencyAttribute on '{member}'", 2035, MessageOrigin.TryGetOrigin (member)); | ||
| continue; | ||
| } | ||
|
|
||
| ProcessReferences (assembly); | ||
| } | ||
| } | ||
|
|
||
| public static bool IsPreserveDependencyAttribute (TypeReference tr) | ||
| { | ||
| return tr.Name == "PreserveDependencyAttribute" && tr.Namespace == "System.Runtime.CompilerServices"; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think you should use
GetLinkerAttributeshere, you already iterate all attributes above so this is doing the same loop and also building cache for member which might not be reached at all.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I originally optimized this a little more, but removed it based on this discussion: #1215 (comment). If you think it is worth it, I could add back the check for this callsite, and only call
GetLinkerAttributesif the previous loop found anyDynamicDependencyAttributes.